Shiloh/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #570 from revant/unprivileged-nginx

Browse Source
This commit is contained in:
Chinmay Pai 2021-11-19 09:05:57 +05:30 committed by GitHub
commit abe6d670c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/frappe-nginx/Dockerfile
View File

@ -17,6 +17,7 @@ RUN apt-get update \
git \ git \
build-essential \ build-essential \
wget \ wget \
# python2 for version-12 builds
python2 \ python2 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -44,13 +45,17 @@ RUN git clone --depth 1 https://github.com/frappe/bench /tmp/bench \
RUN cp -R apps/frappe/frappe/public/* sites/assets/frappe \ RUN cp -R apps/frappe/frappe/public/* sites/assets/frappe \
&& cp -R apps/frappe/node_modules sites/assets/frappe/ && cp -R apps/frappe/node_modules sites/assets/frappe/
FROM nginx:latest FROM nginxinc/nginx-unprivileged:latest
COPY --from=builder /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=builder /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=builder /var/www/error_pages /var/www/ COPY --from=builder /var/www/error_pages /var/www/
COPY build/frappe-nginx/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template COPY build/frappe-nginx/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template
COPY build/frappe-nginx/docker-entrypoint.sh / COPY build/frappe-nginx/docker-entrypoint.sh /
USER root
RUN usermod -u 1000 nginx && groupmod -g 1000 nginx
RUN apt-get update \ RUN apt-get update \
&& apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y \
rsync \ rsync \
@ -59,7 +64,12 @@ RUN apt-get update \
RUN echo "#!/bin/bash" > /rsync \ RUN echo "#!/bin/bash" > /rsync \
&& chmod +x /rsync && chmod +x /rsync
RUN mkdir /assets
VOLUME [ "/assets" ] VOLUME [ "/assets" ]
RUN chown -R nginx:nginx /assets /etc/nginx/conf.d/
USER nginx
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]