Removed start-web.sh and added template to correct place

CERT-Polska · Mar 28, 2024 · e2d529b · e2d529b
1 parent 9278ca2
commit e2d529b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/deploy/docker/Dockerfile-web b/deploy/docker/Dockerfile-web
@@ -18,14 +18,11 @@ LABEL maintainer="info@cert.pl"
 ENV PROXY_BACKEND_URL http://mwdb.:8080
 ENV NGINX_MAX_UPLOAD_SIZE 50M
 
-COPY docker/nginx.conf.template /etc/nginx/conf.d/default.conf.template
-COPY docker/start-web.sh /start-web.sh
+COPY docker/nginx.conf.template /etc/nginx/templates/default.conf.template
 COPY --from=build /app/dist /usr/share/nginx/html
 
 # Give +r to everything in /usr/share/nginx/html and +x for directories
 RUN chmod u=rX,go= -R /usr/share/nginx/html
 
 # By default everything is owned by root - change owner to nginx
 RUN chown nginx:nginx -R /usr/share/nginx/html
-
-CMD ["/bin/sh", "/start-web.sh"]
diff --git a/deploy/docker/Dockerfile-web-dev b/deploy/docker/Dockerfile-web-dev
@@ -12,7 +12,6 @@ RUN cd /app \
     && npm cache clean --force
 
 ENV PROXY_BACKEND_URL http://mwdb.:8080
-ENV NGINX_MAX_UPLOAD_SIZE 50M
 
 WORKDIR /app
 CMD ["npm", "run", "dev"]
diff --git a/docker/nginx.conf.template b/docker/nginx.conf.template
@@ -3,7 +3,7 @@ server {
     server_name  mwdb-web;
     root         /usr/share/nginx/html;
 
-    client_max_body_size ${NGINX_MAX_UPLOAD_SIZE};
+    client_max_body_size "${NGINX_MAX_UPLOAD_SIZE}";
 
     location /api/ {
         proxy_pass ${PROXY_BACKEND_URL}/api/;

diff --git a/docker/start-web.sh b/docker/start-web.sh