From 9b7719455ea049e6680fca281a4d835de4ed892e Mon Sep 17 00:00:00 2001 From: Tim Bolender Date: Tue, 22 Sep 2020 10:16:07 +0000 Subject: [PATCH 1/2] Use new version variables in compose files --- installation/docker-compose-custom.yml | 2 +- installation/docker-compose-erpnext.yml | 14 +++++++------- installation/docker-compose-frappe.yml | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/installation/docker-compose-custom.yml b/installation/docker-compose-custom.yml index 0ef32b77..05fece7a 100644 --- a/installation/docker-compose-custom.yml +++ b/installation/docker-compose-custom.yml @@ -46,7 +46,7 @@ services: - assets-vol:/home/frappe/frappe-bench/sites/assets:rw frappe-socketio: - image: frappe/frappe-socketio:${VERSION} + image: frappe/frappe-socketio:${FRAPPE_VERSION} restart: on-failure depends_on: - redis-socketio diff --git a/installation/docker-compose-erpnext.yml b/installation/docker-compose-erpnext.yml index cecea14d..ce94c2dd 100644 --- a/installation/docker-compose-erpnext.yml +++ b/installation/docker-compose-erpnext.yml @@ -2,7 +2,7 @@ version: '3' services: erpnext-nginx: - image: frappe/erpnext-nginx:${VERSION} + image: frappe/erpnext-nginx:${ERPNEXT_VERSION} restart: on-failure environment: - FRAPPE_PY=erpnext-python @@ -29,7 +29,7 @@ services: - assets-vol:/assets:rw erpnext-python: - image: frappe/erpnext-worker:${VERSION} + image: frappe/erpnext-worker:${ERPNEXT_VERSION} restart: on-failure environment: - MARIADB_HOST=${MARIADB_HOST} @@ -43,7 +43,7 @@ services: - assets-vol:/home/frappe/frappe-bench/sites/assets:rw frappe-socketio: - image: frappe/frappe-socketio:${VERSION} + image: frappe/frappe-socketio:${FRAPPE_VERSION} restart: on-failure depends_on: - redis-socketio @@ -53,7 +53,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-worker-default: - image: frappe/erpnext-worker:${VERSION} + image: frappe/erpnext-worker:${ERPNEXT_VERSION} restart: on-failure command: worker depends_on: @@ -66,7 +66,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-worker-short: - image: frappe/erpnext-worker:${VERSION} + image: frappe/erpnext-worker:${ERPNEXT_VERSION} restart: on-failure command: worker environment: @@ -81,7 +81,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-worker-long: - image: frappe/erpnext-worker:${VERSION} + image: frappe/erpnext-worker:${ERPNEXT_VERSION} restart: on-failure command: worker environment: @@ -96,7 +96,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-schedule: - image: frappe/erpnext-worker:${VERSION} + image: frappe/erpnext-worker:${ERPNEXT_VERSION} restart: on-failure command: schedule depends_on: diff --git a/installation/docker-compose-frappe.yml b/installation/docker-compose-frappe.yml index da44298f..e77df100 100644 --- a/installation/docker-compose-frappe.yml +++ b/installation/docker-compose-frappe.yml @@ -2,7 +2,7 @@ version: '3' services: frappe-nginx: - image: frappe/frappe-nginx:${VERSION} + image: frappe/frappe-nginx:${FRAPPE_VERSION} restart: on-failure environment: - FRAPPE_PY=frappe-python @@ -29,7 +29,7 @@ services: - assets-vol:/assets:rw frappe-python: - image: frappe/frappe-worker:${VERSION} + image: frappe/frappe-worker:${FRAPPE_VERSION} restart: on-failure environment: - MARIADB_HOST=${MARIADB_HOST} @@ -43,7 +43,7 @@ services: - assets-vol:/home/frappe/frappe-bench/sites/assets:rw frappe-socketio: - image: frappe/frappe-socketio:${VERSION} + image: frappe/frappe-socketio:${FRAPPE_VERSION} restart: on-failure depends_on: - redis-socketio @@ -53,7 +53,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-worker-default: - image: frappe/frappe-worker:${VERSION} + image: frappe/frappe-worker:${FRAPPE_VERSION} restart: on-failure command: worker depends_on: @@ -66,7 +66,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-worker-short: - image: frappe/frappe-worker:${VERSION} + image: frappe/frappe-worker:${FRAPPE_VERSION} restart: on-failure command: worker environment: @@ -81,7 +81,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-worker-long: - image: frappe/frappe-worker:${VERSION} + image: frappe/frappe-worker:${FRAPPE_VERSION} restart: on-failure command: worker environment: @@ -96,7 +96,7 @@ services: - sites-vol:/home/frappe/frappe-bench/sites:rw frappe-schedule: - image: frappe/frappe-worker:${VERSION} + image: frappe/frappe-worker:${FRAPPE_VERSION} restart: on-failure command: schedule depends_on: From 115be7dc726f13c3ff04471a163d3e5f7675cde6 Mon Sep 17 00:00:00 2001 From: Tim Bolender Date: Wed, 23 Sep 2020 10:14:05 +0200 Subject: [PATCH 2/2] Use new version variables in tests as well --- env-example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/env-example b/env-example index 0d12cca6..2ca5598c 100644 --- a/env-example +++ b/env-example @@ -1,4 +1,5 @@ -VERSION=edge +ERPNEXT_VERSION=edge +FRAPPE_VERSION=edge MARIADB_HOST=mariadb MYSQL_ROOT_PASSWORD=admin SITES=your.domain.com