From a20dd916d22492e770d3cd67dccd82af7211ac2e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 3 Aug 2022 12:23:32 +0530 Subject: [PATCH] update: use v14 instead of v13 (#871) --- .github/workflows/build_stable.yml | 8 ++++---- docs/backup-and-push-cronjob.md | 2 +- example.env | 4 ++-- pwd.yml | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index 3f62bfc0..d11cc87e 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -68,7 +68,7 @@ jobs: name: Update example.env and pwd.yml runs-on: ubuntu-latest if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - needs: v13 + needs: v14 steps: - name: Checkout @@ -80,7 +80,7 @@ jobs: python-version: "3.10" - name: Get latest versions - run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 13 + run: python3 ./.github/scripts/get_latest_tags.py --repo erpnext --version 14 - name: Update run: | @@ -106,7 +106,7 @@ jobs: name: Release Helm runs-on: ubuntu-latest if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - needs: v13 + needs: v14 steps: - name: Setup deploy key @@ -123,4 +123,4 @@ jobs: run: | git clone git@github.com:frappe/helm.git && cd helm pip install -r release_wizard/requirements.txt - ./release_wizard/wizard 13 patch --remote origin --ci + ./release_wizard/wizard 14 patch --remote origin --ci diff --git a/docs/backup-and-push-cronjob.md b/docs/backup-and-push-cronjob.md index 745758fd..c6051ff8 100644 --- a/docs/backup-and-push-cronjob.md +++ b/docs/backup-and-push-cronjob.md @@ -5,7 +5,7 @@ Create backup service or stack. version: "3.7" services: backup: - image: frappe/erpnext-worker:v13 + image: frappe/erpnext-worker:v14 entrypoint: ["bash", "-c"] command: | for SITE in $(/home/frappe/frappe-bench/env/bin/python -c "import frappe;print(' '.join(frappe.utils.get_sites()))") diff --git a/example.env b/example.env index d510f6b9..ad4e4f11 100644 --- a/example.env +++ b/example.env @@ -1,9 +1,9 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -FRAPPE_VERSION=v13.36.3 +FRAPPE_VERSION=v14.0.0 # Only with ERPNext override -ERPNEXT_VERSION=v13.36.2 +ERPNEXT_VERSION=v14.0.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 59ee7687..cff1072c 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - assets:/home/frappe/frappe-bench/sites/assets configurator: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 command: - configure.py environment: @@ -25,7 +25,7 @@ services: - sites:/home/frappe/frappe-bench/sites create-site: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 deploy: restart_policy: condition: on-failure @@ -54,7 +54,7 @@ services: fi done; echo "common_site_config.json found"; - bench new-site frontend --admin-password=admin --db-root-password=admin --install-app erpnext --set-default; + bench new-site frontend --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default; db: image: mariadb:10.6 @@ -76,7 +76,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext-nginx:v13.36.2 + image: frappe/erpnext-nginx:v14.0.0 deploy: restart_policy: condition: on-failure @@ -94,7 +94,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 deploy: restart_policy: condition: on-failure @@ -107,7 +107,7 @@ services: - sites:/home/frappe/frappe-bench/sites queue-long: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 deploy: restart_policy: condition: on-failure @@ -120,7 +120,7 @@ services: - sites:/home/frappe/frappe-bench/sites queue-short: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext-worker:v13.36.2 + image: frappe/erpnext-worker:v14.0.0 deploy: restart_policy: condition: on-failure @@ -168,7 +168,7 @@ services: - sites:/home/frappe/frappe-bench/sites websocket: - image: frappe/frappe-socketio:v13.36.3 + image: frappe/frappe-socketio:v14.0.0 deploy: restart_policy: condition: on-failure