Merge branch 'main' into STA-966

docker/nginx/Dockerfile

@@ -4,3 +4,4 @@ WORKDIR "/app"
 
 ARG APP_BASE_DIR
 COPY $APP_BASE_DIR .
+RUN cp docker/nginx/default.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file