From fd26b04b1c84322a27c0ded9a39281453707a1b5 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 16 Jan 2024 19:45:24 +0200 Subject: [PATCH] RED-8128 even more stupid --- docker/common/nginx/nginx.conf | 2 +- docker/red-ui/40-check-config.sh | 2 +- docker/red-ui/Dockerfile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index 4f64cd4dd..c6cca8f43 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -28,5 +28,5 @@ http { #gzip on; include /etc/nginx/conf.d/*.conf; - include /tmp/nginx/*.conf; + include /tmp/*.conf; } diff --git a/docker/red-ui/40-check-config.sh b/docker/red-ui/40-check-config.sh index 6bfc3d034..be504eb2c 100755 --- a/docker/red-ui/40-check-config.sh +++ b/docker/red-ui/40-check-config.sh @@ -7,5 +7,5 @@ echo 'Default config:' cat /etc/nginx/conf.d/default.conf echo 'Custom config:' -cat /tmp/nginx/custom.conf +cat /tmp/custom.conf #nginx -g 'daemon off;' diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 51f1a750b..be4cccba3 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -24,7 +24,7 @@ CMD ["/bin/cp", "-r", "/ng-app/dist/paligo-styles", "/tmp/styles-export"] FROM nginx:1.25.3-alpine -ENV NGINX_ENVSUBST_OUTPUT_DIR=/tmp/nginx +ENV NGINX_ENVSUBST_OUTPUT_DIR=/tmp ENV PDFTRON_ALLOWED_HOSTS='' ## Copy our default nginx config COPY docker/common/nginx/nginx.conf /etc/nginx/nginx.conf @@ -37,8 +37,8 @@ RUN rm -rf /usr/share/nginx/html/* COPY --from=builder /ng-app/dist/apps/red-ui /usr/share/nginx/html/ui COPY version.json /usr/share/nginx/html/ui/assets/version/version.json -RUN mkdir /tmp/nginx -RUN chmod a+rw -R /tmp/nginx +#RUN mkdir /tmp/nginx +#RUN chmod a+rw -R /tmp/nginx RUN chmod o+r -R /usr/share/nginx/html RUN chmod g+r -R /usr/share/nginx/html