Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'csp-updates' into 'master'

Browse Source 
RED-8128 even more stupid

See merge request redactmanager/red-ui!262
This commit is contained in:
Dan Percic 2024-01-16 18:49:17 +01:00
commit 7cac85405a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/common/nginx/nginx.conf
View File

@ -28,5 +28,5 @@ http {
#gzip on;
include /etc/nginx/conf.d/*.conf;
include /tmp/nginx/*.conf;
include /tmp/*.conf;
}

2
docker/red-ui/40-check-config.sh
View File

@ -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;'

6
docker/red-ui/Dockerfile
View File

@ -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