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

Merge pull request #572 from revant/fix-erpnext-build

Browse Source 
ci: fix erpnext build
This commit is contained in:
Revant Nandgaonkar 2021-11-19 22:46:58 +05:30 committed by GitHub
commit 6b6a1b9ad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/erpnext-nginx/Dockerfile
View File

@ -24,7 +24,7 @@ RUN chmod +x /install_app \
FROM ${DOCKER_REGISTRY_PREFIX}/frappe-nginx:${IMAGE_TAG} FROM ${DOCKER_REGISTRY_PREFIX}/frappe-nginx:${IMAGE_TAG}
COPY --from=builder /home/frappe/frappe-bench/sites/ /var/www/html/ COPY --from=builder --chown=1000:1000 /home/frappe/frappe-bench/sites/ /var/www/html/
COPY --from=builder /rsync /rsync COPY --from=builder /rsync /rsync
RUN echo "erpnext" >> /var/www/html/apps.txt RUN echo "erpnext" >> /var/www/html/apps.txt

12
build/frappe-nginx/Dockerfile
View File

@ -47,15 +47,15 @@ RUN cp -R apps/frappe/frappe/public/* sites/assets/frappe \
FROM nginxinc/nginx-unprivileged:latest FROM nginxinc/nginx-unprivileged:latest
COPY --from=builder /home/frappe/frappe-bench/sites /var/www/html/
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/docker-entrypoint.sh /
USER root USER root
RUN usermod -u 1000 nginx && groupmod -g 1000 nginx RUN usermod -u 1000 nginx && groupmod -g 1000 nginx
COPY --from=builder --chown=1000:1000 /home/frappe/frappe-bench/sites /var/www/html/
COPY --from=builder --chown=1000:1000 /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/docker-entrypoint.sh /
RUN apt-get update \ RUN apt-get update \
&& apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y \
rsync \ rsync \
@ -67,7 +67,7 @@ RUN echo "#!/bin/bash" > /rsync \
RUN mkdir /assets RUN mkdir /assets
VOLUME [ "/assets" ] VOLUME [ "/assets" ]
RUN chown -R nginx:nginx /assets /etc/nginx/conf.d/ RUN chown -R nginx:nginx /assets /etc/nginx/conf.d/ /var/www/html/
USER nginx USER nginx