From 66343400ffd4b1267ca773e8fd5a8a06297daa41 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 2 Mar 2020 22:58:52 +0530 Subject: [PATCH 1/2] fix: erpnext-assets v12 build --- build/erpnext-assets/v12.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/erpnext-assets/v12.Dockerfile b/build/erpnext-assets/v12.Dockerfile index 85dac5ac..9b13bb13 100644 --- a/build/erpnext-assets/v12.Dockerfile +++ b/build/erpnext-assets/v12.Dockerfile @@ -29,8 +29,8 @@ RUN cp -R /home/frappe/frappe-bench/apps/frappe/frappe/public/* /home/frappe/fra 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/erpnext-assets/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template -COPY build/common/docker-entrypoint.sh / +COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.template +COPY build/erpnext-assets/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean From f09a20a99938b7e62be708262b70be0421fbdca8 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 2 Mar 2020 22:59:10 +0530 Subject: [PATCH 2/2] ci: push branch tags --- .travis.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4856b955..d31a131d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ matrix: - docker tag frappe-worker frappe/frappe-worker:edge - docker tag frappe-worker frappe/frappe-worker:develop - docker push frappe/frappe-worker:edge + - docker push frappe/frappe-worker:develop - name: "Build Frappe nginx + static assets (edge)" if: branch = develop AND type != pull_request script: @@ -48,6 +49,7 @@ matrix: - 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 - name: "Build ERPNext python environment (edge)" if: branch = develop AND type != pull_request script: @@ -55,6 +57,7 @@ matrix: - docker tag erpnext-worker frappe/erpnext-worker:edge - docker tag erpnext-worker frappe/erpnext-worker:develop - docker push frappe/erpnext-worker:edge + - docker push frappe/erpnext-worker:develop - name: "Build ERPNext nginx + static assets (edge)" if: branch = develop AND type != pull_request script: @@ -62,6 +65,7 @@ matrix: - 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 - name: "Build Frappe socketio service (edge)" if: branch = develop AND type != pull_request script: @@ -69,6 +73,7 @@ matrix: - docker tag frappe-socketio frappe/frappe-socketio:edge - docker tag frappe-socketio frappe/frappe-socketio:develop - docker push frappe/frappe-socketio:edge + - docker push frappe/frappe-socketio:develop - name: "Build Frappe python environment (v12)" if: branch = master AND type != pull_request script: @@ -80,8 +85,9 @@ matrix: - docker build -t frappe/frappe-worker:$VERSION -f build/frappe-worker/v12.Dockerfile . - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:version-12 - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:v12 - - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:$VERSION - docker push frappe/frappe-worker:$VERSION + - docker push frappe/frappe-worker:version-12 + - docker push frappe/frappe-worker:v12 - name: "Build Frappe nginx + static assets (v12)" if: branch = master AND type != pull_request script: @@ -94,6 +100,8 @@ matrix: - 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 - name: "Build ERPNext python environment (v12)" if: branch = master AND type != pull_request script: @@ -106,6 +114,8 @@ matrix: - docker tag frappe/erpnext-worker:$VERSION frappe/erpnext-worker:version-12 - docker tag frappe/erpnext-worker:$VERSION frappe/erpnext-worker:v12 - docker push frappe/erpnext-worker:$VERSION + - docker push frappe/erpnext-worker:version-12 + - docker push frappe/erpnext-worker:v12 - name: "Build ERPNext nginx + static assets (v12)" if: branch = master AND type != pull_request script: @@ -118,6 +128,8 @@ matrix: - 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 - name: "Build Frappe socketio service (v12)" if: branch = master AND type != pull_request script: @@ -130,6 +142,8 @@ matrix: - docker tag frappe/frappe-socketio:$VERSION frappe/frappe-socketio:version-12 - docker tag frappe/frappe-socketio:$VERSION frappe/frappe-socketio:v12 - docker push frappe/frappe-socketio:$VERSION + - docker push frappe/frappe-socketio:version-12 + - docker push frappe/frappe-socketio:v12 - name: "Build Frappe python environment (v11)" if: branch = master AND type != pull_request script: @@ -142,6 +156,8 @@ matrix: - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:version-11 - docker tag frappe/frappe-worker:$VERSION frappe/frappe-worker:v11 - docker push frappe/frappe-worker:$VERSION + - docker push frappe/frappe-worker:version-11 + - docker push frappe/frappe-worker:v11 - name: "Build Frappe nginx + static assets (v11)" if: branch = master AND type != pull_request script: @@ -154,6 +170,8 @@ matrix: - 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 - name: "Build ERPNext python environment (v11)" if: branch = master AND type != pull_request script: @@ -166,6 +184,8 @@ matrix: - docker tag frappe/erpnext-worker:$VERSION frappe/erpnext-worker:version-11 - docker tag frappe/erpnext-worker:$VERSION frappe/erpnext-worker:v11 - docker push frappe/erpnext-worker:$VERSION + - docker push frappe/erpnext-worker:version-11 + - docker push frappe/erpnext-worker:v11 - name: "Build ERPNext nginx + static assets (v11)" if: branch = master AND type != pull_request script: @@ -178,6 +198,8 @@ matrix: - 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 - name: "Build Frappe socketio service (v11)" if: branch = master AND type != pull_request script: @@ -190,3 +212,5 @@ matrix: - docker tag frappe/frappe-socketio:$VERSION frappe/frappe-socketio:version-11 - docker tag frappe/frappe-socketio:$VERSION frappe/frappe-socketio:v11 - docker push frappe/frappe-socketio:$VERSION + - docker push frappe/frappe-socketio:version-11 + - docker push frappe/frappe-socketio:v11