From 48a305bec6f08b836f5d5e9642d1b11cd7400061 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 4 Mar 2020 03:43:49 +0000 Subject: [PATCH] Adding in the rsync for the docker-entrypoint --- build/erpnext-assets/Dockerfile | 1 + build/erpnext-assets/docker-entrypoint.sh | 40 ----------------------- build/erpnext-assets/install_app.sh | 1 + build/erpnext-assets/v11.Dockerfile | 1 + build/erpnext-assets/v12.Dockerfile | 1 + build/frappe-assets/docker-entrypoint.sh | 1 + 6 files changed, 5 insertions(+), 40 deletions(-) delete mode 100755 build/erpnext-assets/docker-entrypoint.sh diff --git a/build/erpnext-assets/Dockerfile b/build/erpnext-assets/Dockerfile index 6bec65a0..9e966d53 100644 --- a/build/erpnext-assets/Dockerfile +++ b/build/erpnext-assets/Dockerfile @@ -7,6 +7,7 @@ RUN /install_app erpnext https://github.com/frappe/erpnext FROM frappe/frappe-assets:develop RUN cp /home/frappe/frappe-bench/sites/apps.txt /home/frappe/frappe-bench/sites/apps.bak COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ +COPY --from=0 /rsync /rsync RUN mv /home/frappe/frappe-bench/sites/apps.bak /home/frappe/frappe-bench/sites/apps.txt \ && echo -n "\nerpnext" >> /home/frappe/frappe-bench/sites/apps.txt diff --git a/build/erpnext-assets/docker-entrypoint.sh b/build/erpnext-assets/docker-entrypoint.sh deleted file mode 100755 index 4919fb34..00000000 --- a/build/erpnext-assets/docker-entrypoint.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -## Thanks -# https://serverfault.com/a/919212 -## - -set -e - -rsync -a --delete /var/www/html/assets/js /assets -rsync -a --delete /var/www/html/assets/css /assets -rsync -a --delete /var/www/html/assets/frappe /assets -rsync -a --delete /var/www/html/assets/erpnext /assets - -chmod -R 755 /assets - -if [[ -z "$FRAPPE_PY" ]]; then - export FRAPPE_PY=0.0.0.0 -fi - -if [[ -z "$FRAPPE_PY_PORT" ]]; then - export FRAPPE_PY_PORT=8000 -fi - -if [[ -z "$FRAPPE_SOCKETIO" ]]; then - export FRAPPE_SOCKETIO=0.0.0.0 -fi - -if [[ -z "$SOCKETIO_PORT" ]]; then - export SOCKETIO_PORT=9000 -fi - -envsubst '${API_HOST} - ${API_PORT} - ${FRAPPE_PY} - ${FRAPPE_PY_PORT} - ${FRAPPE_SOCKETIO} - ${SOCKETIO_PORT}' \ - < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf - -exec "$@" diff --git a/build/erpnext-assets/install_app.sh b/build/erpnext-assets/install_app.sh index eefa538a..dd05d228 100644 --- a/build/erpnext-assets/install_app.sh +++ b/build/erpnext-assets/install_app.sh @@ -27,3 +27,4 @@ yarn install --production=true mkdir -p /home/frappe/frappe-bench/sites/assets/${APP_NAME} cp -R /home/frappe/frappe-bench/apps/${APP_NAME}/${APP_NAME}/public/* /home/frappe/frappe-bench/sites/assets/${APP_NAME} +echo "rsync -a --delete /var/www/html/assets/${APP_NAME} /assets" > /rsync \ No newline at end of file diff --git a/build/erpnext-assets/v11.Dockerfile b/build/erpnext-assets/v11.Dockerfile index f46c2030..351cacb8 100644 --- a/build/erpnext-assets/v11.Dockerfile +++ b/build/erpnext-assets/v11.Dockerfile @@ -7,6 +7,7 @@ RUN /install_app erpnext https://github.com/frappe/erpnext version-11 FROM frappe/frappe-assets:v11 RUN cp /home/frappe/frappe-bench/sites/apps.txt /home/frappe/frappe-bench/sites/apps.bak COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ +COPY --from=0 /rsync /rsync RUN mv /home/frappe/frappe-bench/sites/apps.bak /home/frappe/frappe-bench/sites/apps.txt \ && echo -n "\nerpnext" >> /home/frappe/frappe-bench/sites/apps.txt diff --git a/build/erpnext-assets/v12.Dockerfile b/build/erpnext-assets/v12.Dockerfile index cb29ea1b..83e163b3 100644 --- a/build/erpnext-assets/v12.Dockerfile +++ b/build/erpnext-assets/v12.Dockerfile @@ -7,6 +7,7 @@ RUN /install_app erpnext https://github.com/frappe/erpnext version-12 FROM frappe/frappe-assets:v12 RUN cp /home/frappe/frappe-bench/sites/apps.txt /home/frappe/frappe-bench/sites/apps.bak COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ +COPY --from=0 /rsync /rsync RUN mv /home/frappe/frappe-bench/sites/apps.bak /home/frappe/frappe-bench/sites/apps.txt \ && echo -n "\nerpnext" >> /home/frappe/frappe-bench/sites/apps.txt VOLUME [ "/assets" ] diff --git a/build/frappe-assets/docker-entrypoint.sh b/build/frappe-assets/docker-entrypoint.sh index f68e7fd3..67128558 100755 --- a/build/frappe-assets/docker-entrypoint.sh +++ b/build/frappe-assets/docker-entrypoint.sh @@ -9,6 +9,7 @@ set -e rsync -a --delete /var/www/html/assets/js /assets rsync -a --delete /var/www/html/assets/css /assets rsync -a --delete /var/www/html/assets/frappe /assets +. /rsync chmod -R 755 /assets