From f1393c3a9405c010679a664446aec35d80399fd2 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 20 Mar 2020 05:21:30 +0530 Subject: [PATCH] fix(frappe-nginx): fix missing /rsync fixes #160 --- build/erpnext-nginx/install_app.sh | 3 ++- build/frappe-nginx/Dockerfile | 4 +++- build/frappe-nginx/v11.Dockerfile | 4 +++- build/frappe-nginx/v12.Dockerfile | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build/erpnext-nginx/install_app.sh b/build/erpnext-nginx/install_app.sh index 65a1af6f..324f2bd3 100755 --- a/build/erpnext-nginx/install_app.sh +++ b/build/erpnext-nginx/install_app.sh @@ -27,5 +27,6 @@ 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 +chmod +x /rsync -rm /home/frappe/frappe-bench/sites/apps.txt \ No newline at end of file +rm /home/frappe/frappe-bench/sites/apps.txt diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile index 64df31b7..6fa6441a 100644 --- a/build/frappe-nginx/Dockerfile +++ b/build/frappe-nginx/Dockerfile @@ -32,7 +32,9 @@ 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-nginx/docker-entrypoint.sh / -RUN apt-get update && apt-get install -y rsync && apt-get clean +RUN apt-get update && apt-get install -y rsync && apt-get clean \ + && echo "#!/bin/bash" > /rsync \ + && chmod +x /rsync VOLUME [ "/assets" ] diff --git a/build/frappe-nginx/v11.Dockerfile b/build/frappe-nginx/v11.Dockerfile index e44e7663..a1852f8d 100644 --- a/build/frappe-nginx/v11.Dockerfile +++ b/build/frappe-nginx/v11.Dockerfile @@ -32,7 +32,9 @@ 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-nginx/docker-entrypoint.sh / -RUN apt-get update && apt-get install -y rsync && apt-get clean +RUN apt-get update && apt-get install -y rsync && apt-get clean \ + && echo "#!/bin/bash" > /rsync \ + && chmod +x /rsync VOLUME [ "/assets" ] diff --git a/build/frappe-nginx/v12.Dockerfile b/build/frappe-nginx/v12.Dockerfile index 29adfead..c1860a2a 100644 --- a/build/frappe-nginx/v12.Dockerfile +++ b/build/frappe-nginx/v12.Dockerfile @@ -32,7 +32,9 @@ 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-nginx/docker-entrypoint.sh / -RUN apt-get update && apt-get install -y rsync && apt-get clean +RUN apt-get update && apt-get install -y rsync && apt-get clean \ + && echo "#!/bin/bash" > /rsync \ + && chmod +x /rsync VOLUME [ "/assets" ]