From 6f7a9b92ac382a7588f8e72beb94014e59967d62 Mon Sep 17 00:00:00 2001 From: Davide Bortolami Date: Tue, 3 Mar 2020 23:40:11 +0000 Subject: [PATCH] Refactor renaming erpnext-assets and frappe-assets to erpnext-nginx and frappe-nginx --- .travis.yml | 68 +++++++++---------- .../Dockerfile | 2 +- .../docker-entrypoint.sh | 0 .../v11.Dockerfile | 2 +- .../v12.Dockerfile | 2 +- .../Dockerfile | 2 +- .../docker-entrypoint.sh | 0 .../v11.Dockerfile | 2 +- .../v12.Dockerfile | 2 +- installation/docker-compose-erpnext.yml | 4 +- installation/docker-compose-frappe.yml | 4 +- 11 files changed, 44 insertions(+), 44 deletions(-) rename build/{erpnext-assets => erpnext-nginx}/Dockerfile (96%) rename build/{erpnext-assets => erpnext-nginx}/docker-entrypoint.sh (100%) rename build/{erpnext-assets => erpnext-nginx}/v11.Dockerfile (96%) rename build/{erpnext-assets => erpnext-nginx}/v12.Dockerfile (96%) rename build/{frappe-assets => frappe-nginx}/Dockerfile (96%) rename build/{frappe-assets => frappe-nginx}/docker-entrypoint.sh (100%) rename build/{frappe-assets => frappe-nginx}/v11.Dockerfile (96%) rename build/{frappe-assets => frappe-nginx}/v12.Dockerfile (96%) diff --git a/.travis.yml b/.travis.yml index 8158bb93..9aed1347 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,11 +30,11 @@ matrix: - name: "Build Frappe nginx + static assets (edge)" if: branch = develop AND type != pull_request script: - - docker build -t frappe-assets -f build/frappe-assets/Dockerfile . - - docker tag frappe-assets frappe/frappe-assets:edge - - docker tag frappe-assets frappe/frappe-assets:develop - - docker push frappe/frappe-assets:edge - - docker push frappe/frappe-assets:develop + - docker build -t frappe-nginx -f build/frappe-nginx/Dockerfile . + - docker tag frappe-nginx frappe/frappe-nginx:edge + - docker tag frappe-nginx frappe/frappe-nginx:develop + - docker push frappe/frappe-nginx:edge + - docker push frappe/frappe-nginx:develop - name: "Build ERPNext python environment (edge)" if: branch = develop AND type != pull_request script: @@ -46,11 +46,11 @@ matrix: - name: "Build ERPNext nginx + static assets (edge)" if: branch = develop AND type != pull_request script: - - docker build -t erpnext-assets -f build/erpnext-assets/Dockerfile . - - docker tag erpnext-assets frappe/erpnext-assets:edge - - docker tag erpnext-assets frappe/erpnext-assets:develop - - docker push frappe/erpnext-assets:edge - - docker push frappe/erpnext-assets:develop + - docker build -t erpnext-nginx -f build/erpnext-nginx/Dockerfile . + - docker tag erpnext-nginx frappe/erpnext-nginx:edge + - docker tag erpnext-nginx frappe/erpnext-nginx:develop + - docker push frappe/erpnext-nginx:edge + - docker push frappe/erpnext-nginx:develop - name: "Build Frappe socketio service (edge)" if: branch = develop AND type != pull_request script: @@ -81,12 +81,12 @@ matrix: - git fetch --tags - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#') - cd .. - - docker build -t frappe/frappe-assets:$VERSION -f build/frappe-assets/v12.Dockerfile . - - docker tag frappe/frappe-assets:$VERSION frappe/frappe-assets:version-12 - - docker tag frappe/frappe-assets:$VERSION frappe/frappe-assets:v12 - - docker push frappe/frappe-assets:$VERSION - - docker push frappe/frappe-assets:version-12 - - docker push frappe/frappe-assets:v12 + - docker build -t frappe/frappe-nginx:$VERSION -f build/frappe-nginx/v12.Dockerfile . + - docker tag frappe/frappe-nginx:$VERSION frappe/frappe-nginx:version-12 + - docker tag frappe/frappe-nginx:$VERSION frappe/frappe-nginx:v12 + - docker push frappe/frappe-nginx:$VERSION + - docker push frappe/frappe-nginx:version-12 + - docker push frappe/frappe-nginx:v12 - name: "Build ERPNext python environment (v12)" if: branch = master AND type != pull_request script: @@ -109,12 +109,12 @@ matrix: - git fetch --tags - export VERSION=$(git tag --list --sort=-version:refname "v12*" | sed -n 1p | sed -e 's#.*@\(\)#\1#') - cd .. - - docker build -t frappe/erpnext-assets:$VERSION -f build/erpnext-assets/v12.Dockerfile . - - docker tag frappe/erpnext-assets:$VERSION frappe/erpnext-assets:version-12 - - docker tag frappe/erpnext-assets:$VERSION frappe/erpnext-assets:v12 - - docker push frappe/erpnext-assets:$VERSION - - docker push frappe/erpnext-assets:version-12 - - docker push frappe/erpnext-assets:v12 + - docker build -t frappe/erpnext-nginx:$VERSION -f build/erpnext-nginx/v12.Dockerfile . + - docker tag frappe/erpnext-nginx:$VERSION frappe/erpnext-nginx:version-12 + - docker tag frappe/erpnext-nginx:$VERSION frappe/erpnext-nginx:v12 + - docker push frappe/erpnext-nginx:$VERSION + - docker push frappe/erpnext-nginx:version-12 + - docker push frappe/erpnext-nginx:v12 - name: "Build Frappe socketio service (v12)" if: branch = master AND type != pull_request script: @@ -151,12 +151,12 @@ matrix: - git fetch --tags - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#') - cd .. - - docker build -t frappe/frappe-assets:$VERSION -f build/frappe-assets/v11.Dockerfile . - - docker tag frappe/frappe-assets:$VERSION frappe/frappe-assets:version-11 - - docker tag frappe/frappe-assets:$VERSION frappe/frappe-assets:v11 - - docker push frappe/frappe-assets:$VERSION - - docker push frappe/frappe-assets:version-11 - - docker push frappe/frappe-assets:v11 + - docker build -t frappe/frappe-nginx:$VERSION -f build/frappe-nginx/v11.Dockerfile . + - docker tag frappe/frappe-nginx:$VERSION frappe/frappe-nginx:version-11 + - docker tag frappe/frappe-nginx:$VERSION frappe/frappe-nginx:v11 + - docker push frappe/frappe-nginx:$VERSION + - docker push frappe/frappe-nginx:version-11 + - docker push frappe/frappe-nginx:v11 - name: "Build ERPNext python environment (v11)" if: branch = master AND type != pull_request script: @@ -179,12 +179,12 @@ matrix: - git fetch --tags - export VERSION=$(git tag --list --sort=-version:refname "v11*" | sed -n 1p | sed -e 's#.*@\(\)#\1#') - cd .. - - docker build -t frappe/erpnext-assets:$VERSION -f build/erpnext-assets/v11.Dockerfile . - - docker tag frappe/erpnext-assets:$VERSION frappe/erpnext-assets:version-11 - - docker tag frappe/erpnext-assets:$VERSION frappe/erpnext-assets:v11 - - docker push frappe/erpnext-assets:$VERSION - - docker push frappe/erpnext-assets:version-11 - - docker push frappe/erpnext-assets:v11 + - docker build -t frappe/erpnext-nginx:$VERSION -f build/erpnext-nginx/v11.Dockerfile . + - docker tag frappe/erpnext-nginx:$VERSION frappe/erpnext-nginx:version-11 + - docker tag frappe/erpnext-nginx:$VERSION frappe/erpnext-nginx:v11 + - docker push frappe/erpnext-nginx:$VERSION + - docker push frappe/erpnext-nginx:version-11 + - docker push frappe/erpnext-nginx:v11 - name: "Build Frappe socketio service (v11)" if: branch = master AND type != pull_request script: 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