diff --git a/build/erpnext-assets/Dockerfile b/build/erpnext-nginx/Dockerfile similarity index 96% rename from build/erpnext-assets/Dockerfile rename to build/erpnext-nginx/Dockerfile index 7fcb2b20..967a8c04 100644 --- a/build/erpnext-assets/Dockerfile +++ b/build/erpnext-nginx/Dockerfile @@ -30,7 +30,7 @@ FROM nginx:latest COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /var/www/error_pages /var/www/ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/erpnext-assets/docker-entrypoint.sh / +COPY build/erpnext-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean diff --git a/build/erpnext-assets/docker-entrypoint.sh b/build/erpnext-nginx/docker-entrypoint.sh similarity index 100% rename from build/erpnext-assets/docker-entrypoint.sh rename to build/erpnext-nginx/docker-entrypoint.sh diff --git a/build/erpnext-assets/v11.Dockerfile b/build/erpnext-nginx/v11.Dockerfile similarity index 96% rename from build/erpnext-assets/v11.Dockerfile rename to build/erpnext-nginx/v11.Dockerfile index 6db3b415..5d737448 100644 --- a/build/erpnext-assets/v11.Dockerfile +++ b/build/erpnext-nginx/v11.Dockerfile @@ -30,7 +30,7 @@ FROM nginx:latest COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /var/www/error_pages /var/www/ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/erpnext-assets/docker-entrypoint.sh / +COPY build/erpnext-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean diff --git a/build/erpnext-assets/v12.Dockerfile b/build/erpnext-nginx/v12.Dockerfile similarity index 96% rename from build/erpnext-assets/v12.Dockerfile rename to build/erpnext-nginx/v12.Dockerfile index 9b13bb13..16b2c1fe 100644 --- a/build/erpnext-assets/v12.Dockerfile +++ b/build/erpnext-nginx/v12.Dockerfile @@ -30,7 +30,7 @@ FROM nginx:latest COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /var/www/error_pages /var/www/ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/erpnext-assets/docker-entrypoint.sh / +COPY build/erpnext-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean diff --git a/build/frappe-assets/Dockerfile b/build/frappe-nginx/Dockerfile similarity index 96% rename from build/frappe-assets/Dockerfile rename to build/frappe-nginx/Dockerfile index 762e74d1..03b40883 100644 --- a/build/frappe-assets/Dockerfile +++ b/build/frappe-nginx/Dockerfile @@ -27,7 +27,7 @@ FROM nginx:latest COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /var/www/error_pages /var/www/ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/frappe-assets/docker-entrypoint.sh / +COPY build/frappe-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean diff --git a/build/frappe-assets/docker-entrypoint.sh b/build/frappe-nginx/docker-entrypoint.sh similarity index 100% rename from build/frappe-assets/docker-entrypoint.sh rename to build/frappe-nginx/docker-entrypoint.sh diff --git a/build/frappe-assets/v11.Dockerfile b/build/frappe-nginx/v11.Dockerfile similarity index 96% rename from build/frappe-assets/v11.Dockerfile rename to build/frappe-nginx/v11.Dockerfile index 225243d2..cfeb2c3d 100644 --- a/build/frappe-assets/v11.Dockerfile +++ b/build/frappe-nginx/v11.Dockerfile @@ -27,7 +27,7 @@ FROM nginx:latest COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /var/www/error_pages /var/www/ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/frappe-assets/docker-entrypoint.sh / +COPY build/frappe-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean diff --git a/build/frappe-assets/v12.Dockerfile b/build/frappe-nginx/v12.Dockerfile similarity index 96% rename from build/frappe-assets/v12.Dockerfile rename to build/frappe-nginx/v12.Dockerfile index cbbac49b..4994ad28 100644 --- a/build/frappe-assets/v12.Dockerfile +++ b/build/frappe-nginx/v12.Dockerfile @@ -27,7 +27,7 @@ FROM nginx:latest COPY --from=0 /home/frappe/frappe-bench/sites /var/www/html/ COPY --from=0 /var/www/error_pages /var/www/ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/frappe-assets/docker-entrypoint.sh / +COPY build/frappe-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean diff --git a/installation/docker-compose-erpnext.yml b/installation/docker-compose-erpnext.yml index 93b7c6a1..f932a512 100644 --- a/installation/docker-compose-erpnext.yml +++ b/installation/docker-compose-erpnext.yml @@ -1,8 +1,8 @@ version: '3' services: - erpnext-assets: - image: frappe/erpnext-assets:${VERSION} + erpnext-nginx: + image: frappe/erpnext-nginx:${VERSION} restart: on-failure environment: - FRAPPE_PY=erpnext-python diff --git a/installation/docker-compose-frappe.yml b/installation/docker-compose-frappe.yml index 869fb73c..df1e7c43 100644 --- a/installation/docker-compose-frappe.yml +++ b/installation/docker-compose-frappe.yml @@ -1,8 +1,8 @@ version: '3' services: - frappe-assets: - image: frappe/frappe-assets:${VERSION} + frappe-nginx: + image: frappe/frappe-nginx:${VERSION} restart: on-failure environment: - FRAPPE_PY=frappe-python