From f7768a4abc2732dfda461249f72ad3ff926c9264 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Apr 2023 18:02:27 +0000 Subject: [PATCH 01/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index ed2db4ef..6224949c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.20.0 +ERPNEXT_VERSION=v14.20.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8811db01..453e22f5 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.20.0 + image: frappe/erpnext:v14.20.1 deploy: restart_policy: condition: on-failure From d851972b36b41e27fd78c73c436e8555451edda7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 17:16:54 +0530 Subject: [PATCH 02/58] chore(deps): bump peter-evans/create-pull-request from 4 to 5 (#1114) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 295831e6..7290563b 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -16,7 +16,7 @@ jobs: uses: vrslev/pre-commit-autoupdate@v1.0.0 - name: Create Pull Request - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v5 with: branch: pre-commit-autoupdate title: "chore(deps): Update pre-commit hooks" From 130e6a7ff2eff36c0191332cb8f852fd18789ec5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Apr 2023 19:10:21 +0000 Subject: [PATCH 03/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 6224949c..09bbef7f 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.20.1 +ERPNEXT_VERSION=v14.20.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 453e22f5..6c962a59 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.20.1 + image: frappe/erpnext:v14.20.2 deploy: restart_policy: condition: on-failure From 6d4185e318156544dbe05d0b800d13c9351ecc61 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 6 Apr 2023 08:05:59 +0000 Subject: [PATCH 04/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 09bbef7f..89b88aec 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.20.2 +ERPNEXT_VERSION=v14.20.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6c962a59..e2f15de6 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.20.2 + image: frappe/erpnext:v14.20.3 deploy: restart_policy: condition: on-failure From 1183250a307e19597cc4e887ab12dfa2dad1fb9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 02:54:24 +0530 Subject: [PATCH 05/58] chore(deps): bump pytest from 7.2.2 to 7.3.0 (#1115) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.2 to 7.3.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.2.2...7.3.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index c021c5b5..e75a2e00 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.2.2 +pytest==7.3.0 From 2bd0b12d51b8deabea58039ef326fc03066cb991 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 11 Apr 2023 11:52:46 +0000 Subject: [PATCH 06/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 89b88aec..52f4d257 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.20.3 +ERPNEXT_VERSION=v14.21.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e2f15de6..ee691d37 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.20.3 + image: frappe/erpnext:v14.21.0 deploy: restart_policy: condition: on-failure From 572b6483d4ef3ea80b2fcb535e5ce3706050c696 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 19:04:21 +0530 Subject: [PATCH 07/58] chore(deps): bump pytest from 7.3.0 to 7.3.1 (#1118) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.0 to 7.3.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.3.0...7.3.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index e75a2e00..c4d04a08 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.3.0 +pytest==7.3.1 From 65fc0ab67a7db38e319594143e86abd52e02826a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Apr 2023 01:48:10 +0000 Subject: [PATCH 08/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 52f4d257..a7125d18 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.21.0 +ERPNEXT_VERSION=v14.22.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ee691d37..93042bc4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.21.0 + image: frappe/erpnext:v14.22.0 deploy: restart_policy: condition: on-failure From e56454a147cef8d6183edf40ceb8bc23c521588c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Apr 2023 09:01:03 +0530 Subject: [PATCH 09/58] chore(deps): bump docker/bake-action from 2.3.0 to 3.0.0 (#1120) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 2.3.0 to 3.0.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v2.3.0...v3.0.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/docker-build-push.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index db6fe87d..f0b40677 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -32,7 +32,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build and test - uses: docker/bake-action@v2.3.0 + uses: docker/bake-action@v3.0.0 with: targets: bench-test @@ -45,7 +45,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v2.3.0 + uses: docker/bake-action@v3.0.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 8b43242a..70f0d435 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -43,7 +43,7 @@ jobs: run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} - name: Build - uses: docker/bake-action@v2.3.0 + uses: docker/bake-action@v3.0.0 with: push: true env: @@ -71,6 +71,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v2.3.0 + uses: docker/bake-action@v3.0.0 with: push: true From 37ae8018e76d67306b951af21806bc3f8f83413d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Apr 2023 05:24:54 +0000 Subject: [PATCH 10/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index a7125d18..7d47da29 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.22.0 +ERPNEXT_VERSION=v14.22.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 93042bc4..2a2da8a3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.22.0 + image: frappe/erpnext:v14.22.1 deploy: restart_policy: condition: on-failure From 0b108910023cda2be593cb281db916a750bfd4aa Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Apr 2023 07:46:10 +0000 Subject: [PATCH 11/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 7d47da29..e285d8f3 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.22.1 +ERPNEXT_VERSION=v14.22.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2a2da8a3..211b2813 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.22.1 + image: frappe/erpnext:v14.22.2 deploy: restart_policy: condition: on-failure From 266ae176b513fa62cbb76e578bb1533a699be76b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:42:25 +0530 Subject: [PATCH 12/58] chore(deps): bump docker/bake-action from 3.0.0 to 3.0.1 (#1123) * chore(deps): bump docker/bake-action from 3.0.0 to 3.0.1 Bumps [docker/bake-action](https://github.com/docker/bake-action) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ci: upgrade pip for pre-commit lint * ci: use python from ubuntu repos * ci: install build essential * ci: remove cache action --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Revant Nandgaonkar --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/docker-build-push.yml | 4 ++-- .github/workflows/lint.yml | 10 +--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index f0b40677..ad6fe0b6 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -32,7 +32,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build and test - uses: docker/bake-action@v3.0.0 + uses: docker/bake-action@v3.0.1 with: targets: bench-test @@ -45,7 +45,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v3.0.0 + uses: docker/bake-action@v3.0.1 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 70f0d435..beeb0acc 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -43,7 +43,7 @@ jobs: run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} - name: Build - uses: docker/bake-action@v3.0.0 + uses: docker/bake-action@v3.0.1 with: push: true env: @@ -71,6 +71,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v3.0.0 + uses: docker/bake-action@v3.0.1 with: push: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f2d053f1..432c9dbd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.10.6" # For shfmt pre-commit hook - name: Setup Go @@ -26,14 +26,6 @@ jobs: with: go-version: "^1.14" - - name: Cache - uses: actions/cache@v3 - with: - path: | - ~/.cache/pre-commit - ~/.cache/pip - key: lint-${{ hashFiles('.pre-commit-config.yaml') }} - - name: Install pre-commit run: pip install -U pre-commit From 1b05e5f43ed2960ddf1b9e92cdc1b0464c0651a4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 24 Apr 2023 12:53:29 +0000 Subject: [PATCH 13/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index e285d8f3..11903bde 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.22.2 +ERPNEXT_VERSION=v14.22.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 211b2813..1541306e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.22.2 + image: frappe/erpnext:v14.22.3 deploy: restart_policy: condition: on-failure From 1bfb5dbf2c495071399898a96c33f973fa9f06e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Apr 2023 17:08:59 +0000 Subject: [PATCH 14/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 11903bde..bc566563 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.22.3 +ERPNEXT_VERSION=v14.23.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1541306e..1a755c9b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.22.3 + image: frappe/erpnext:v14.23.0 deploy: restart_policy: condition: on-failure From 03d1d95b6a1e0c209c26c8e66f616750d49cf296 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 04:51:05 +0530 Subject: [PATCH 15/58] chore(deps): Update pre-commit hooks (#1128) Co-authored-by: vrslev --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6409cfd5..b76a9086 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 + rev: v3.3.2 hooks: - id: pyupgrade args: [--py37-plus] @@ -24,7 +24,7 @@ repos: - id: isort - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.6 + rev: v3.0.0-alpha.9-for-vscode hooks: - id: prettier From 25a7633e0c61c846d80fe17676dc9ac6c1ac24ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 3 May 2023 04:34:42 +0000 Subject: [PATCH 16/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index bc566563..0adf5fc7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.23.0 +ERPNEXT_VERSION=v14.23.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1a755c9b..ecd7cc9e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.23.0 + image: frappe/erpnext:v14.23.1 deploy: restart_policy: condition: on-failure From 2e67ef231a1c9d6de501018c1b4c802de3e33bbe Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 May 2023 05:06:09 +0000 Subject: [PATCH 17/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 0adf5fc7..2c835893 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.23.1 +ERPNEXT_VERSION=v14.23.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ecd7cc9e..8d3e88e3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.23.1 + image: frappe/erpnext:v14.23.2 deploy: restart_policy: condition: on-failure From 5d3b01f9ce0acc609398dad84eebc0198341d138 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 May 2023 18:14:29 +0000 Subject: [PATCH 18/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 2c835893..48180265 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.23.2 +ERPNEXT_VERSION=v14.23.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8d3e88e3..ad5e6a01 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.23.2 + image: frappe/erpnext:v14.23.3 deploy: restart_policy: condition: on-failure From 3ff0528865c20d8eec30465db09c13b027410bed Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 6 May 2023 11:26:37 +0000 Subject: [PATCH 19/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 48180265..4e3162b9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.23.3 +ERPNEXT_VERSION=v14.23.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ad5e6a01..9ef4e1bc 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.23.3 + image: frappe/erpnext:v14.23.4 deploy: restart_policy: condition: on-failure From e3e97dc47dbeb4085d04b0ac0374105fd40bd665 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 7 May 2023 17:45:24 +0530 Subject: [PATCH 20/58] chore(deps): Update pre-commit hooks (#1134) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b76a9086..1c4b5d8b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.3.2 + rev: v3.4.0 hooks: - id: pyupgrade args: [--py37-plus] From e129437c2b1df0da349ce0ed2bfc8adb977cfcee Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 May 2023 05:52:21 +0000 Subject: [PATCH 21/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 4e3162b9..c61de36a 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.23.4 +ERPNEXT_VERSION=v14.24.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9ef4e1bc..49258508 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.23.4 + image: frappe/erpnext:v14.24.0 deploy: restart_policy: condition: on-failure From e9fa75d1444aaca73d67efcaea16107b93a2378e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 10 May 2023 15:47:37 +0530 Subject: [PATCH 22/58] fix: use stable bench branch (#1138) #1137 --- images/bench/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index dbcb4593..40cbbaaf 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bullseye-slim as bench LABEL author=frappé ARG GIT_REPO=https://github.com/frappe/bench.git -ARG GIT_BRANCH=develop +ARG GIT_BRANCH=v5.x RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ From 01a96f2c8d96319e799dd5b3f7e989ae83659149 Mon Sep 17 00:00:00 2001 From: akash-m-envsage <122703615+akash-m-envsage@users.noreply.github.com> Date: Fri, 12 May 2023 08:43:12 +0530 Subject: [PATCH 23/58] fix(data persistency): docker volume persistency issue (#1139) because of the missing /data path, there was an issue wherein the data would be lost after docker compose down --- overrides/compose.postgres.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/compose.postgres.yaml b/overrides/compose.postgres.yaml index f126fa31..433ca71a 100644 --- a/overrides/compose.postgres.yaml +++ b/overrides/compose.postgres.yaml @@ -12,7 +12,7 @@ services: environment: POSTGRES_PASSWORD: ${DB_PASSWORD:?No db password set} volumes: - - db-data:/var/lib/postgresql + - db-data:/var/lib/postgresql/data volumes: db-data: From 7abad8876e3b27ee55d92030805be89a5c98225d Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 12 May 2023 10:17:31 +0000 Subject: [PATCH 24/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index c61de36a..d6277151 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.24.0 +ERPNEXT_VERSION=v14.24.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 49258508..6707d2d9 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.24.0 + image: frappe/erpnext:v14.24.1 deploy: restart_policy: condition: on-failure From 5e93b3cdcd24e1bb125e4388d02dec8d716fd94e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 May 2023 17:13:07 +0000 Subject: [PATCH 25/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index d6277151..e563fab6 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.24.1 +ERPNEXT_VERSION=v14.24.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6707d2d9..850d2bf2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.24.1 + image: frappe/erpnext:v14.24.2 deploy: restart_policy: condition: on-failure From a8ee0056227d0f35716c1dd26e67f5a465d137c7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 18 May 2023 09:45:16 +0000 Subject: [PATCH 26/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index e563fab6..0579ab29 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.24.2 +ERPNEXT_VERSION=v14.24.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 850d2bf2..62845e47 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.24.2 + image: frappe/erpnext:v14.24.3 deploy: restart_policy: condition: on-failure From 68514dd80e3b5ada6cf65ba1ffc7dc2bb958cd3e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 May 2023 03:14:45 +0000 Subject: [PATCH 27/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 0579ab29..5f56d5bc 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.24.3 +ERPNEXT_VERSION=v14.25.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 62845e47..6b317646 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.24.3 + image: frappe/erpnext:v14.25.0 deploy: restart_policy: condition: on-failure From ebe09e4e607eaca8b54ce44326faa77647f4d3c3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 May 2023 07:08:22 +0000 Subject: [PATCH 28/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 5f56d5bc..f30c3c8b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.25.0 +ERPNEXT_VERSION=v14.25.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6b317646..c7d80e03 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.25.0 + image: frappe/erpnext:v14.25.1 deploy: restart_policy: condition: on-failure From 191fb66a0d3c078fdc0ab9b0a2665370899f94b8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 31 May 2023 06:29:50 +0000 Subject: [PATCH 29/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index f30c3c8b..3376223f 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.25.1 +ERPNEXT_VERSION=v14.26.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c7d80e03..7a7f619f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.25.1 + image: frappe/erpnext:v14.26.0 deploy: restart_policy: condition: on-failure From ea48cf5300195aefd35462f2e3cd24c63d8a273f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 10:09:27 +0530 Subject: [PATCH 30/58] chore(deps): Update pre-commit hooks (#1145) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1c4b5d8b..d8a41ace 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: types: [shell] - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.9.0.2 + rev: v0.9.0.5 hooks: - id: shellcheck args: [-x] From 84569ea158446a32e4622c2a31e9376127c7e1bb Mon Sep 17 00:00:00 2001 From: Hardik Zinzuvadiya <25708027+Z4nzu@users.noreply.github.com> Date: Sat, 3 Jun 2023 10:44:33 +0530 Subject: [PATCH 31/58] Fix typo in PROXY_READ_TIMEOUT in .env and pwd.yaml (#1146) * Fix typo in PROXY_READ_TIMEOUT in pwd.yaml * Fix typo in PROXY_READ_TIMEOUT in example.env --- example.env | 2 +- pwd.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example.env b/example.env index 3376223f..17ea6622 100644 --- a/example.env +++ b/example.env @@ -38,7 +38,7 @@ UPSTREAM_REAL_IP_RECURSIVE= # All Values Allowed by nginx proxy_read_timeout are allowed, default value is 120s # Useful if you have longrunning print formats or slow loading sites -PROXY_READ_TIMOUT= +PROXY_READ_TIMEOUT= # All Values allowed by nginx client_max_body_size are allowed, default value is 50m # Necessary if the upload limit in the frappe application is increased diff --git a/pwd.yml b/pwd.yml index 7a7f619f..e76df870 100644 --- a/pwd.yml +++ b/pwd.yml @@ -103,7 +103,7 @@ services: UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1 UPSTREAM_REAL_IP_HEADER: X-Forwarded-For UPSTREAM_REAL_IP_RECURSIVE: "off" - PROXY_READ_TIMOUT: 120 + PROXY_READ_TIMEOUT: 120 CLIENT_MAX_BODY_SIZE: 50m volumes: - sites:/home/frappe/frappe-bench/sites From 4a87ecdf9ecf6733c005df3b08d7e247fe3b81e5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Jun 2023 06:28:56 +0000 Subject: [PATCH 32/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 17ea6622..d7494783 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.26.0 +ERPNEXT_VERSION=v14.27.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e76df870..79f51d64 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.26.0 + image: frappe/erpnext:v14.27.0 deploy: restart_policy: condition: on-failure From 0adebb1e23f0acd5f559992c6a4da79d6f8efc7c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Jun 2023 17:09:09 +0000 Subject: [PATCH 33/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index d7494783..79adb454 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.0 +ERPNEXT_VERSION=v14.27.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 79f51d64..a86a6be0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.0 + image: frappe/erpnext:v14.27.1 deploy: restart_policy: condition: on-failure From 3ee6acab4fff0bc05424ecd4455c7254b175e829 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:51:50 +0530 Subject: [PATCH 34/58] chore(deps): Update pre-commit hooks (#1147) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8a41ace..795ec09c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.4.0 + rev: v3.6.0 hooks: - id: pyupgrade args: [--py37-plus] From a6e1baa9b705e2e1563706821f4aab8a7eef484e Mon Sep 17 00:00:00 2001 From: Karan Janthe <86996507+KMJ-007@users.noreply.github.com> Date: Tue, 13 Jun 2023 04:06:15 +0530 Subject: [PATCH 35/58] added guide for linux/mac to setup frappe docker (#1149) * added guide for linux/mac to setup frappe docker * guide added in readme * linting done according to guidelines --- README.md | 1 + docs/setup_for_linux_mac.md | 249 ++++++++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+) create mode 100644 docs/setup_for_linux_mac.md diff --git a/README.md b/README.md index 933d70a8..436e3f4a 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Wait for 5 minutes for ERPNext site to be created or check `create-site` contain - [Backup and Push Cron Job](docs/backup-and-push-cronjob.md) - [Port Based Multi Tenancy](docs/port-based-multi-tenancy.md) - [Migrate from multi-image setup](docs/migrate-from-multi-image-setup.md) +- [running on linux/mac](docs/setup_for_linux_mac.md) ### [Custom Images](#custom-images) diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md new file mode 100644 index 00000000..a6ca38bd --- /dev/null +++ b/docs/setup_for_linux_mac.md @@ -0,0 +1,249 @@ +# How to install ERPNext on linux/mac using Frappe_docker ? + +step1: clone the repo + +``` +git clone https://github.com/frappe/frappe_docker +``` + +step2: add platform: linux/amd64 to all services in the /pwd.yaml + +here is the update pwd.yml file + +```yml +version: "3" + +services: + backend: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + + configurator: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: none + entrypoint: + - bash + - -c + command: + - > + ls -1 apps > sites/apps.txt; + bench set-config -g db_host $$DB_HOST; + bench set-config -gp db_port $$DB_PORT; + bench set-config -g redis_cache "redis://$$REDIS_CACHE"; + bench set-config -g redis_queue "redis://$$REDIS_QUEUE"; + bench set-config -g redis_socketio "redis://$$REDIS_SOCKETIO"; + bench set-config -gp socketio_port $$SOCKETIO_PORT; + environment: + DB_HOST: db + DB_PORT: "3306" + REDIS_CACHE: redis-cache:6379 + REDIS_QUEUE: redis-queue:6379 + REDIS_SOCKETIO: redis-socketio:6379 + SOCKETIO_PORT: "9000" + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + + create-site: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: none + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + entrypoint: + - bash + - -c + command: + - > + wait-for-it -t 120 db:3306; + wait-for-it -t 120 redis-cache:6379; + wait-for-it -t 120 redis-queue:6379; + wait-for-it -t 120 redis-socketio:6379; + export start=`date +%s`; + until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \ + [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_cache // empty"` ]] && \ + [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]]; + do + echo "Waiting for sites/common_site_config.json to be created"; + sleep 5; + if (( `date +%s`-start > 120 )); then + echo "could not find sites/common_site_config.json with required keys"; + exit 1 + fi + done; + echo "sites/common_site_config.json found"; + bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default; + + db: + image: mariadb:10.6 + platform: linux/amd64 + healthcheck: + test: mysqladmin ping -h localhost --password=admin + interval: 1s + retries: 15 + deploy: + restart_policy: + condition: on-failure + command: + - --character-set-server=utf8mb4 + - --collation-server=utf8mb4_unicode_ci + - --skip-character-set-client-handshake + - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 + environment: + MYSQL_ROOT_PASSWORD: admin + volumes: + - db-data:/var/lib/mysql + + frontend: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + command: + - nginx-entrypoint.sh + environment: + BACKEND: backend:8000 + FRAPPE_SITE_NAME_HEADER: frontend + SOCKETIO: websocket:9000 + UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1 + UPSTREAM_REAL_IP_HEADER: X-Forwarded-For + UPSTREAM_REAL_IP_RECURSIVE: "off" + PROXY_READ_TIMEOUT: 120 + CLIENT_MAX_BODY_SIZE: 50m + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + ports: + - "8080:8080" + + queue-default: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + command: + - bench + - worker + - --queue + - default + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + + queue-long: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + command: + - bench + - worker + - --queue + - long + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + + queue-short: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + command: + - bench + - worker + - --queue + - short + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + + redis-queue: + image: redis:6.2-alpine + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + volumes: + - redis-queue-data:/data + + redis-cache: + image: redis:6.2-alpine + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + volumes: + - redis-cache-data:/data + + redis-socketio: + image: redis:6.2-alpine + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + volumes: + - redis-socketio-data:/data + + scheduler: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + command: + - bench + - schedule + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + + websocket: + image: frappe/erpnext:v14.27.1 + platform: linux/amd64 + deploy: + restart_policy: + condition: on-failure + command: + - node + - /home/frappe/frappe-bench/apps/frappe/socketio.js + volumes: + - sites:/home/frappe/frappe-bench/sites + - logs:/home/frappe/frappe-bench/logs + +volumes: + db-data: + redis-queue-data: + redis-cache-data: + redis-socketio-data: + sites: + logs: +``` + +step3: run the docker + +``` +docker-compose -f ./pwd.yaml up +``` + +--- + +Wait for couple of minutes. + +Open localhost:8080 From 6ecc6202bc2697f14604d50a9e830ec7c13beced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 04:06:34 +0530 Subject: [PATCH 36/58] chore(deps): bump pytest from 7.3.1 to 7.3.2 (#1150) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.1 to 7.3.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.3.1...7.3.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index c4d04a08..56628493 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.3.1 +pytest==7.3.2 From ebed6f8f67f857505b051da913d2a4b367b39eac Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Jun 2023 05:19:32 +0000 Subject: [PATCH 37/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 79adb454..65b06d3d 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.1 +ERPNEXT_VERSION=v14.27.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a86a6be0..cb416899 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.1 + image: frappe/erpnext:v14.27.2 deploy: restart_policy: condition: on-failure From f75623f372b3b50257e7818f74296c671f5a97b4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Jun 2023 15:32:30 +0000 Subject: [PATCH 38/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 65b06d3d..94997e99 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.2 +ERPNEXT_VERSION=v14.27.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index cb416899..1beab690 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.2 + image: frappe/erpnext:v14.27.3 deploy: restart_policy: condition: on-failure From 507eeb334a264d5f6489754ca5cdeb0384e92380 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Jun 2023 06:52:30 +0000 Subject: [PATCH 39/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 94997e99..7e75b19c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.3 +ERPNEXT_VERSION=v14.27.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1beab690..d74a6653 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.3 + image: frappe/erpnext:v14.27.4 deploy: restart_policy: condition: on-failure From 4a6c7956e493ddfaced906064edc63ed32b2018d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Jun 2023 08:21:31 +0000 Subject: [PATCH 40/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 7e75b19c..4226cf1c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.4 +ERPNEXT_VERSION=v14.27.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d74a6653..90388abe 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.4 + image: frappe/erpnext:v14.27.5 deploy: restart_policy: condition: on-failure From 335cbe4777f017c7ccfb383e11d29f26b3f530ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 08:41:26 +0530 Subject: [PATCH 41/58] chore(deps): Update pre-commit hooks (#1153) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 795ec09c..dfb5b4d1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: prettier - repo: https://github.com/codespell-project/codespell - rev: v2.2.4 + rev: v2.2.5 hooks: - id: codespell args: From 90edb8492ef67d67d5d832a189afc05b089dd0af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 08:41:48 +0530 Subject: [PATCH 42/58] chore(deps): bump docker/bake-action from 3.0.1 to 3.1.0 (#1151) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v3.0.1...v3.1.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/docker-build-push.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index ad6fe0b6..158c7f45 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -32,7 +32,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build and test - uses: docker/bake-action@v3.0.1 + uses: docker/bake-action@v3.1.0 with: targets: bench-test @@ -45,7 +45,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v3.0.1 + uses: docker/bake-action@v3.1.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index beeb0acc..138de9fe 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -43,7 +43,7 @@ jobs: run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} - name: Build - uses: docker/bake-action@v3.0.1 + uses: docker/bake-action@v3.1.0 with: push: true env: @@ -71,6 +71,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v3.0.1 + uses: docker/bake-action@v3.1.0 with: push: true From a14bdf37847e48d27524570eac932a35e949b438 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 Jun 2023 07:18:47 +0000 Subject: [PATCH 43/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 4226cf1c..bdb8ee88 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.5 +ERPNEXT_VERSION=v14.27.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 90388abe..5e3592f4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.5 + image: frappe/erpnext:v14.27.6 deploy: restart_policy: condition: on-failure From a27f7514721e29f387e3f6d676429b1dbce6fbe7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 Jun 2023 08:46:06 +0000 Subject: [PATCH 44/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index bdb8ee88..279cc0b4 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.6 +ERPNEXT_VERSION=v14.27.7 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 5e3592f4..958e9c23 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.6 + image: frappe/erpnext:v14.27.7 deploy: restart_policy: condition: on-failure From 82dbfd9c0b7eb59de3b92a3b8568bee9bb80e891 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Jun 2023 11:51:42 +0000 Subject: [PATCH 45/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 279cc0b4..538cfda0 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.7 +ERPNEXT_VERSION=v14.27.8 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 958e9c23..57dbf619 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.7 + image: frappe/erpnext:v14.27.8 deploy: restart_policy: condition: on-failure From 59b3f3b180d52a0f0c3341a5ae37659ae50a48ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:31:59 +0530 Subject: [PATCH 46/58] chore(deps): Update pre-commit hooks (#1156) Co-authored-by: vrslev --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dfb5b4d1..4fe958bb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.6.0 + rev: v3.7.0 hooks: - id: pyupgrade args: [--py37-plus] From 5145e4fff56fd71e8c0d8da071197a5d1e89eba0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 20 Jun 2023 16:17:32 +0000 Subject: [PATCH 47/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 538cfda0..f0e1fd6a 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.8 +ERPNEXT_VERSION=v14.27.9 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 57dbf619..03f36f3a 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.8 + image: frappe/erpnext:v14.27.9 deploy: restart_policy: condition: on-failure From a2cfbf988f06eec686fdcca3399d81b1ab8738c6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Jun 2023 06:38:16 +0000 Subject: [PATCH 48/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index f0e1fd6a..aac1667d 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.9 +ERPNEXT_VERSION=v14.27.10 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 03f36f3a..669ff2c3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.9 + image: frappe/erpnext:v14.27.10 deploy: restart_policy: condition: on-failure From 32b5140c75997b8738755cab4e45fc7fc29c43b1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Jun 2023 09:46:34 +0000 Subject: [PATCH 49/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index aac1667d..18b82dae 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.10 +ERPNEXT_VERSION=v14.27.11 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 669ff2c3..f7aa8c19 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.10 + image: frappe/erpnext:v14.27.11 deploy: restart_policy: condition: on-failure From 2c3a57ae900060d532e56c58e92e1d2b0e58d4eb Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 23 Jun 2023 03:10:17 +0000 Subject: [PATCH 50/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 18b82dae..1a2f2ea2 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.11 +ERPNEXT_VERSION=v14.27.12 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f7aa8c19..3281cdbf 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.11 + image: frappe/erpnext:v14.27.12 deploy: restart_policy: condition: on-failure From e6c0e7263b8fe144dd3b59f150b60fef5aa5e162 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 26 Jun 2023 11:54:37 +0530 Subject: [PATCH 51/58] ci: refactor (#1158) * ci: refactor use debian bookworm use updated wkhtmltopdf override python and nodejs versions * ci: fix bench and test * ci: remove comments from example.env * docs: add maintenance section --- .github/workflows/build_bench.yml | 3 +++ .github/workflows/build_stable.yml | 4 ++++ .github/workflows/docker-build-push.yml | 13 +++++++++++++ CONTRIBUTING.md | 11 +++++++++++ docker-bake.hcl | 11 +++++++++-- images/bench/Dockerfile | 7 ++++--- images/custom/Containerfile | 12 +++++++----- images/production/Containerfile | 12 +++++++----- 8 files changed, 58 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index 158c7f45..9f8fd510 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -31,6 +31,9 @@ jobs: - name: Setup Buildx uses: docker/setup-buildx-action@v2 + - name: Set Environment Variables + run: cat example.env | grep -o '^[^#]*' >> "$GITHUB_ENV" + - name: Build and test uses: docker/bake-action@v3.1.0 with: diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index e842a3dc..f33832c1 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -36,6 +36,8 @@ jobs: repo: erpnext version: "13" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + python_version: 3.9.17 + node_version: 14.21.3 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} @@ -46,6 +48,8 @@ jobs: repo: erpnext version: "14" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + python_version: 3.10.12 + node_version: 16.20.1 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 138de9fe..2bdb363d 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -14,6 +14,14 @@ on: push: required: true type: boolean + python_version: + required: true + type: string + description: Python Version + node_version: + required: true + type: string + description: NodeJS Version secrets: DOCKERHUB_USERNAME: required: true @@ -42,6 +50,11 @@ jobs: - name: Get latest versions run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} + - name: Set build args + run: | + echo "PYTHON_VERSION=${{ inputs.python_version }}" >> "$GITHUB_ENV" + echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" + - name: Build uses: docker/bake-action@v3.1.0 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb315ca4..3cc671ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,3 +68,14 @@ Place relevant markdown files in the `docs` directory and index them in README.m # Frappe and ERPNext updates Each Frappe/ERPNext release triggers new stable images builds as well as bump to helm chart. + +# Maintenance + +In case of new release of Debian. e.g. bullseye to bookworm. Change following files: + +- `images/erpnext/Containerfile` and `images/custom/Containerfile`: Change the files to use new debian release, make sure new python version tag that is available on new debian release image. e.g. 3.9.9 (bullseye) to 3.9.17 (bookworm) or 3.10.5 (bullseye) to 3.10.12 (bookworm). Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly. +- `images/bench/Dockerfile`: Change the files to use new debian release. Make sure apt-get packages and wkhtmltopdf version are also upgraded accordingly. + +Change following files on release of ERPNext + +- `.github/workflows/build_stable.yml`: Add the new release step under `jobs` and remove the unmaintained one. e.g. In case v12, v13 available, v14 will be added and v12 will be removed on release of v14. Also change the `needs:` for later steps to `v14` from `v13`. diff --git a/docker-bake.hcl b/docker-bake.hcl index 9d542136..568e0668 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -5,6 +5,13 @@ variable "REGISTRY_USER" { default = "frappe" } +variable PYTHON_VERSION { + default = "3.11.4" +} +variable NODE_VERSION { + default = "18.16.1" +} + variable "FRAPPE_VERSION" { default = "develop" } @@ -65,8 +72,8 @@ target "default-args" { BENCH_REPO = "${BENCH_REPO}" FRAPPE_BRANCH = "${FRAPPE_VERSION}" ERPNEXT_BRANCH = "${ERPNEXT_VERSION}" - PYTHON_VERSION = can(regex("v13", "${ERPNEXT_VERSION}")) ? "3.9.9" : "3.10.5" - NODE_VERSION = can(regex("v13", "${FRAPPE_VERSION}")) ? "14.19.3" : "16.18.0" + PYTHON_VERSION = "${PYTHON_VERSION}" + NODE_VERSION = "${NODE_VERSION}" } } diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 40cbbaaf..92470bc7 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim as bench +FROM debian:bookworm-slim as bench LABEL author=frappé @@ -75,10 +75,11 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ && dpkg-reconfigure --frontend=noninteractive locales # Detect arch and install wkhtmltopdf -ENV WKHTMLTOPDF_VERSION 0.12.6-1 +ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 +ARG WKHTMLTOPDF_DISTRO=bookworm RUN if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \ && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \ - && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \ + && downloaded_file=wkhtmltox_${WKHTMLTOPDF_VERSION}.${WKHTMLTOPDF_DISTRO}_${ARCH}.deb \ && wget -q https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \ && dpkg -i $downloaded_file \ && rm $downloaded_file diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 3a16f952..e9200833 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -1,11 +1,13 @@ -ARG PYTHON_VERSION=3.10.5 -FROM python:${PYTHON_VERSION}-slim-bullseye AS base +ARG PYTHON_VERSION=3.11.4 +ARG DEBIAN_BASE=bookworm +FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base COPY resources/nginx-template.conf /templates/nginx/frappe.conf.template COPY resources/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh -ARG WKHTMLTOPDF_VERSION=0.12.6-1 -ARG NODE_VERSION=16.18.0 +ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 +ARG WKHTMLTOPDF_DISTRO=bookworm +ARG NODE_VERSION=18.16.1 ENV NVM_DIR=/home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -47,7 +49,7 @@ RUN useradd -ms /bin/bash frappe \ # Install wkhtmltopdf with patched qt && if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \ && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \ - && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \ + && downloaded_file=wkhtmltox_${WKHTMLTOPDF_VERSION}.${WKHTMLTOPDF_DISTRO}_${ARCH}.deb \ && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \ && apt-get install -y ./$downloaded_file \ && rm $downloaded_file \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 5f761c81..2add02a0 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -1,8 +1,10 @@ -ARG PYTHON_VERSION=3.10.5 -FROM python:${PYTHON_VERSION}-slim-bullseye AS base +ARG PYTHON_VERSION=3.11.4 +ARG DEBIAN_BASE=bookworm +FROM python:${PYTHON_VERSION}-slim-${DEBIAN_BASE} AS base -ARG WKHTMLTOPDF_VERSION=0.12.6-1 -ARG NODE_VERSION=16.18.0 +ARG WKHTMLTOPDF_VERSION=0.12.6.1-3 +ARG WKHTMLTOPDF_DISTRO=bookworm +ARG NODE_VERSION=18.16.1 ENV NVM_DIR=/home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} @@ -44,7 +46,7 @@ RUN useradd -ms /bin/bash frappe \ # Install wkhtmltopdf with patched qt && if [ "$(uname -m)" = "aarch64" ]; then export ARCH=arm64; fi \ && if [ "$(uname -m)" = "x86_64" ]; then export ARCH=amd64; fi \ - && downloaded_file=wkhtmltox_$WKHTMLTOPDF_VERSION.buster_${ARCH}.deb \ + && downloaded_file=wkhtmltox_${WKHTMLTOPDF_VERSION}.${WKHTMLTOPDF_DISTRO}_${ARCH}.deb \ && curl -sLO https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/$downloaded_file \ && apt-get install -y ./$downloaded_file \ && rm $downloaded_file \ From e401be4cb07403b83befe93f6fb8b81980e5c5a6 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Mon, 26 Jun 2023 14:05:25 +0530 Subject: [PATCH 52/58] docs: update python and nodejs version (#1159) python image 3.10.12 onwards gets built on bookworm --- docs/custom-apps.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/custom-apps.md b/docs/custom-apps.md index 8646e86d..22b19dc5 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -45,8 +45,8 @@ Note: buildah build \ --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ --build-arg=FRAPPE_BRANCH=version-14 \ - --build-arg=PYTHON_VERSION=3.10.5 \ - --build-arg=NODE_VERSION=16.18.0 \ + --build-arg=PYTHON_VERSION=3.10.12 \ + --build-arg=NODE_VERSION=16.20.1 \ --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ --tag=ghcr.io/user/repo/custom:1.0.0 \ --file=images/custom/Containerfile . @@ -88,8 +88,8 @@ podman run --rm -it \ --context=git://github.com/frappe/frappe_docker \ --build-arg=FRAPPE_PATH=https://github.com/frappe/frappe \ --build-arg=FRAPPE_BRANCH=version-14 \ - --build-arg=PYTHON_VERSION=3.10.5 \ - --build-arg=NODE_VERSION=16.18.0 \ + --build-arg=PYTHON_VERSION=3.10.12 \ + --build-arg=NODE_VERSION=16.20.1 \ --build-arg=APPS_JSON_BASE64=$APPS_JSON_BASE64 \ --cache=true \ --destination=ghcr.io/user/repo/custom:1.0.0 \ From 412230c63a43cf26fe786e18279b6ab448951867 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:22:02 +0530 Subject: [PATCH 53/58] chore(deps): bump pytest from 7.3.2 to 7.4.0 (#1160) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.3.2...7.4.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 56628493..70613be0 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==7.3.2 +pytest==7.4.0 From ed6301c48f68d34dd3db3e1571f5edf749f7987a Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 27 Jun 2023 11:42:27 +0530 Subject: [PATCH 54/58] ci: fix develop build (#1161) --- .github/workflows/build_develop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index c3807451..97ed9a88 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -26,6 +26,8 @@ jobs: repo: erpnext version: develop push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + python_version: 3.11.4 + node_version: 18.16.1 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} From 445bc3402e48c922908e831c84879381cd3b2f80 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Jun 2023 05:09:48 +0000 Subject: [PATCH 55/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 1a2f2ea2..0724a315 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.12 +ERPNEXT_VERSION=v14.27.13 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3281cdbf..8876a0ee 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.12 + image: frappe/erpnext:v14.27.13 deploy: restart_policy: condition: on-failure From 779f8be4fe11133064c76a7cc256fb7afcf27dfb Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 28 Jun 2023 15:53:35 +0530 Subject: [PATCH 56/58] fix: add python 3.11 and nodejs 18 (#1163) used for frappe develop branch --- images/bench/Dockerfile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 92470bc7..e12d5e53 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -95,16 +95,19 @@ USER frappe WORKDIR /home/frappe # Install Python via pyenv -ENV PYTHON_VERSION_V13=3.9.9 -ENV PYTHON_VERSION=3.10.5 +ENV PYTHON_VERSION_V13=3.9.17 +ENV PYTHON_VERSION_DEVELOP=3.11.4 +ENV PYTHON_VERSION=3.10.12 ENV PYENV_ROOT /home/frappe/.pyenv ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH # From https://github.com/pyenv/pyenv#basic-github-checkout RUN git clone --depth 1 https://github.com/pyenv/pyenv.git .pyenv \ && pyenv install $PYTHON_VERSION_V13 \ + && pyenv install $PYTHON_VERSION_DEVELOP \ && pyenv install $PYTHON_VERSION \ && PYENV_VERSION=$PYTHON_VERSION_V13 pip install --no-cache-dir virtualenv \ + && PYENV_VERSION=$PYTHON_VERSION_DEVELOP pip install --no-cache-dir virtualenv \ && PYENV_VERSION=$PYTHON_VERSION pip install --no-cache-dir virtualenv \ && pyenv global $PYTHON_VERSION $PYTHON_VERSION_v13 \ && sed -Ei -e '/^([^#]|$)/ {a export PYENV_ROOT="/home/frappe/.pyenv" a export PATH="$PYENV_ROOT/bin:$PATH" a ' -e ':a' -e '$!{n;ba};}' ~/.profile \ @@ -122,15 +125,19 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc # Install Node via nvm -ENV NODE_VERSION_14=14.19.3 -ENV NODE_VERSION=16.18.0 +ENV NODE_VERSION_13=14.21.3 +ENV NODE_VERSION_DEVELOP=14.21.3 +ENV NODE_VERSION=16.20.1 ENV NVM_DIR /home/frappe/.nvm ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin/:${PATH} RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \ && . ${NVM_DIR}/nvm.sh \ - && nvm install ${NODE_VERSION_14} \ - && nvm use v${NODE_VERSION_14} \ + && nvm install ${NODE_VERSION_13} \ + && nvm use v${NODE_VERSION_13} \ + && npm install -g yarn \ + && nvm install ${NODE_VERSION_DEVELOP} \ + && nvm use v${NODE_VERSION_DEVELOP} \ && npm install -g yarn \ && nvm install ${NODE_VERSION} \ && nvm use v${NODE_VERSION} \ From 0279f8fae2beb6d559927be11c435e4371a23bfb Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Jun 2023 15:38:22 +0000 Subject: [PATCH 57/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 0724a315..3ca2b3c9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.13 +ERPNEXT_VERSION=v14.27.14 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8876a0ee..f219f766 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.13 + image: frappe/erpnext:v14.27.14 deploy: restart_policy: condition: on-failure From ce272a9290742befa8fa4ae1b6c73162fb23c266 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Jun 2023 16:16:24 +0000 Subject: [PATCH 58/58] chore: Update example.env --- example.env | 2 +- pwd.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example.env b/example.env index 3ca2b3c9..029f1106 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v14.27.14 +ERPNEXT_VERSION=v14.28.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f219f766..11b8ce4d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure @@ -112,7 +112,7 @@ services: - "8080:8080" queue-default: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure @@ -126,7 +126,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-long: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure @@ -140,7 +140,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure @@ -178,7 +178,7 @@ services: - redis-socketio-data:/data scheduler: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure @@ -190,7 +190,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v14.27.14 + image: frappe/erpnext:v14.28.0 deploy: restart_policy: condition: on-failure