From a71dc70ed7ec1911c90a3f28da9edd7e11d70790 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 21 Feb 2025 10:11:32 +0000 Subject: [PATCH 01/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 7b0b4d1c..0e85738f 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.53.0 +ERPNEXT_VERSION=v15.53.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1adf2e27..79bf6703 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.53.0 + image: frappe/erpnext:v15.53.1 networks: - frappe_network deploy: From f069cffa5d853cc8477571acdfc154644165cb75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:01:56 +0530 Subject: [PATCH 02/45] chore(deps): bump docker/bake-action from 6.3.0 to 6.4.0 (#1570) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v6.3.0...v6.4.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 20aba1f3..173cf9e5 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v6.3.0 + uses: docker/bake-action@v6.4.0 with: source: . targets: bench-test @@ -52,7 +52,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v6.3.0 + uses: docker/bake-action@v6.4.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index ae4b1ece..8562456d 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -63,7 +63,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v6.3.0 + uses: docker/bake-action@v6.4.0 with: source: . push: true @@ -92,6 +92,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v6.3.0 + uses: docker/bake-action@v6.4.0 with: push: true From bff029dca3e198de5d8d9d129a4e621ebab6a94d Mon Sep 17 00:00:00 2001 From: bgodlin <37313677+bgodlin@users.noreply.github.com> Date: Sun, 23 Feb 2025 07:22:37 +0100 Subject: [PATCH 03/45] Fix `installer.py` (#1571) * Update installer.py Revising the `installer.py` script. The script is facing an issue during execution as it required interactive input for the root username unless the username was provided as a flag https://github.com/frappe/frappe/blob/42f9e537d0de84bdcd540281d5f8149ea5d50eaa/frappe/installer.py#L157-L158. Resolving this by passing the username as a flag allows the script to proceed successfully. * ci: pin pre-commit/prettier to 3.5.2 --------- Co-authored-by: Revant Nandgaonkar --- .pre-commit-config.yaml | 2 ++ development/installer.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 11aa7e45..932c7f93 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,6 +27,8 @@ repos: rev: v4.0.0-alpha.8 hooks: - id: prettier + additional_dependencies: + - prettier@3.5.2 - repo: https://github.com/codespell-project/codespell rev: v2.4.1 diff --git a/development/installer.py b/development/installer.py index f977b822..edd62147 100755 --- a/development/installer.py +++ b/development/installer.py @@ -207,6 +207,7 @@ def create_site_in_bench(args): new_site_cmd = [ "bench", "new-site", + f"--db-root-username=root", f"--db-host=mariadb", # Should match the compose service name f"--db-type={args.db_type}", # Add the selected database type f"--mariadb-user-host-login-scope=%", @@ -222,6 +223,7 @@ def create_site_in_bench(args): new_site_cmd = [ "bench", "new-site", + f"--db-root-username=root", f"--db-host=postgresql", # Should match the compose service name f"--db-type={args.db_type}", # Add the selected database type f"--db-root-password=123", # Replace with your PostgreSQL password From 6382fa3d81ff43cef604e5340a66c56a01e09ee3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Feb 2025 13:07:58 +0000 Subject: [PATCH 04/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 0e85738f..812ae18a 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.53.1 +ERPNEXT_VERSION=v15.53.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 79bf6703..455609e4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.53.1 + image: frappe/erpnext:v15.53.2 networks: - frappe_network deploy: From 0c78566fe9985315d3206e7a2b558c0f4616132c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:56:36 +0530 Subject: [PATCH 05/45] chore(deps): Update pre-commit hooks (#1576) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .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 932c7f93..5a1d6036 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: - id: black - repo: https://github.com/pycqa/isort - rev: 6.0.0 + rev: 6.0.1 hooks: - id: isort From 8cfbbbb1e936eb62672e96fb64c3e6d45f33a9ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2025 12:57:10 +0530 Subject: [PATCH 06/45] chore(deps): bump docker/bake-action from 6.4.0 to 6.5.0 (#1577) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v6.4.0...v6.5.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 173cf9e5..f7bf4c09 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v6.4.0 + uses: docker/bake-action@v6.5.0 with: source: . targets: bench-test @@ -52,7 +52,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v6.4.0 + uses: docker/bake-action@v6.5.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 8562456d..8042a94c 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -63,7 +63,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v6.4.0 + uses: docker/bake-action@v6.5.0 with: source: . push: true @@ -92,6 +92,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v6.4.0 + uses: docker/bake-action@v6.5.0 with: push: true From d43a93adbb93de6c07028b95e787d42aaeb15638 Mon Sep 17 00:00:00 2001 From: "Hoa \"Rin\" Nguyen" Date: Sun, 2 Mar 2025 23:18:12 +1100 Subject: [PATCH 07/45] docs: fix typo yaml -> yml in README.md (#1579) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 269db059..39f843eb 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ After cloning the repo run this command to build multi-architecture images speci and then -- add `platform: linux/arm64` to all services in the pwd.yaml +- add `platform: linux/arm64` to all services in the `pwd.yml` - replace the current specified versions of erpnext image on `pwd.yml` with `:latest` Then run: `docker compose -f pwd.yml up -d` From 4288aad11c9e2a48f5d6e6dfc344f7cf8727bada Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Mar 2025 04:11:37 +0000 Subject: [PATCH 08/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 812ae18a..bca98c91 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.53.2 +ERPNEXT_VERSION=v15.53.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 455609e4..9f0d6f1a 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.53.2 + image: frappe/erpnext:v15.53.3 networks: - frappe_network deploy: From 5bc7e460097f2e52d39367559f68cea16958991f Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Mar 2025 05:21:09 +0000 Subject: [PATCH 09/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index bca98c91..80d6fd25 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.53.3 +ERPNEXT_VERSION=v15.53.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9f0d6f1a..390327c3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.53.3 + image: frappe/erpnext:v15.53.4 networks: - frappe_network deploy: From f4c3b8024b2f63cd3d01ab5f2bb7ae47dbb5c39a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 15:52:54 +0530 Subject: [PATCH 10/45] chore(deps): bump pytest from 8.3.4 to 8.3.5 (#1581) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.4 to 8.3.5. - [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/8.3.4...8.3.5) --- 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 d197ada2..2c78728c 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.3.4 +pytest==8.3.5 From 2ee921f2b34102f106b40b7f693c66a93fe55c6e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Mar 2025 13:37:46 +0000 Subject: [PATCH 11/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 80d6fd25..88cd9023 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.53.4 +ERPNEXT_VERSION=v15.54.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 390327c3..54dce928 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: From a9095fc46ae8b0902dd8184a2cfe97b31f70a9fc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 6 Mar 2025 11:14:58 +0000 Subject: [PATCH 12/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 88cd9023..3a8a07ab 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.0 +ERPNEXT_VERSION=v15.54.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 54dce928..2c538ca3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: From 636e325006b0b572b513bbc1ebc001020fcb7641 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 8 Mar 2025 07:51:45 +0000 Subject: [PATCH 13/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 3a8a07ab..dad48b4b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.1 +ERPNEXT_VERSION=v15.54.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2c538ca3..7dd9b29f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: From ffb4369af85009e9020875864f659c8f50923fe7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 9 Mar 2025 11:13:50 +0000 Subject: [PATCH 14/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index dad48b4b..742d3ee7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.2 +ERPNEXT_VERSION=v15.54.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7dd9b29f..d9b0473e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: From 9601c1615e17d34b5882c1742123df667e08cc17 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Mar 2025 14:47:09 +0000 Subject: [PATCH 15/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 742d3ee7..22315d59 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.3 +ERPNEXT_VERSION=v15.54.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d9b0473e..b12e9dbc 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: From 1e0fba995964f122445bae0caec7dce08f0ce2d7 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 13 Mar 2025 14:03:55 +0530 Subject: [PATCH 16/45] ci: for arm64 build frappe/erpnext like frappe/bench (#1587) --- .github/workflows/docker-build-push.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 8042a94c..fc189eff 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -45,14 +45,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up QEMU + - name: Setup QEMU uses: docker/setup-qemu-action@v3 + with: + image: tonistiigi/binfmt:latest + platforms: all - name: Setup Buildx uses: docker/setup-buildx-action@v3 - with: - driver-opts: network=host - platforms: linux/${{ matrix.arch }} - name: Get latest versions run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} @@ -95,3 +95,4 @@ jobs: uses: docker/bake-action@v6.5.0 with: push: true + set: "*.platform=linux/amd64,linux/arm64" From 02e24c9d2dd0db3319bca81d0cdf7de113c03f0a Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 15 Mar 2025 19:07:33 +0530 Subject: [PATCH 17/45] build: add pkg-config deb package in build layer (#1590) * build: add pkg-config deb package in build layer * ci: only use tonistiigi/binfmt for image push * revert: arm64 builds * ci: copy build_bench to docker-build-push * ci: set driver-opts network=host for buildx action --- .github/workflows/docker-build-push.yml | 5 ++++- images/bench/Dockerfile | 1 + images/custom/Containerfile | 1 + images/production/Containerfile | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index fc189eff..ffccb67c 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest services: registry: - image: registry:2 + image: docker.io/registry:2 ports: - 5000:5000 strategy: @@ -53,6 +53,9 @@ jobs: - name: Setup Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host + platforms: linux/${{ matrix.arch }} - name: Get latest versions run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 8281e255..ba7641cf 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -47,6 +47,7 @@ RUN apt-get update \ libsasl2-dev \ libtiff5-dev \ libwebp-dev \ + pkg-config \ redis-tools \ rlwrap \ tk8.6-dev \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index a35b93fe..ff02845b 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -94,6 +94,7 @@ RUN apt-get update \ libsasl2-dev \ libtiff5-dev \ libwebp-dev \ + pkg-config \ redis-tools \ rlwrap \ tk8.6-dev \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 78c80f73..7f36e0ed 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -86,6 +86,7 @@ RUN apt-get update \ libsasl2-dev \ libtiff5-dev \ libwebp-dev \ + pkg-config \ redis-tools \ rlwrap \ tk8.6-dev \ From 509de1f49f0f6b26a4b0a004a12569802eadf4a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 07:24:13 +0530 Subject: [PATCH 18/45] chore(deps): bump webfactory/ssh-agent from 0.8.0 to 0.9.1 (#1592) Bumps [webfactory/ssh-agent](https://github.com/webfactory/ssh-agent) from 0.8.0 to 0.9.1. - [Release notes](https://github.com/webfactory/ssh-agent/releases) - [Changelog](https://github.com/webfactory/ssh-agent/blob/master/CHANGELOG.md) - [Commits](https://github.com/webfactory/ssh-agent/compare/v0.8.0...v0.9.1) --- updated-dependencies: - dependency-name: webfactory/ssh-agent 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_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index 3566b2ba..f24960ba 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -100,7 +100,7 @@ jobs: steps: - name: Setup deploy key - uses: webfactory/ssh-agent@v0.8.0 + uses: webfactory/ssh-agent@v0.9.1 with: ssh-private-key: ${{ secrets.HELM_DEPLOY_KEY }} From 973eafff693032be84fc8b276454468530128c3b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Mar 2025 11:54:45 +0000 Subject: [PATCH 19/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 22315d59..79ea8720 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.4 +ERPNEXT_VERSION=v15.54.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b12e9dbc..a5de2a39 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.4 + image: frappe/erpnext:v15.54.5 networks: - frappe_network deploy: From c6f687f253ef9a396e0ca149746ccf611d285858 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Mar 2025 14:41:56 +0000 Subject: [PATCH 20/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 79ea8720..7230caf9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.5 +ERPNEXT_VERSION=v15.55.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a5de2a39..933baa19 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.5 + image: frappe/erpnext:v15.55.0 networks: - frappe_network deploy: From e4ecbb396a3daf55e00a628ed48a18870a818f52 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Mar 2025 04:35:37 +0000 Subject: [PATCH 21/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 7230caf9..97ef72ab 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.55.0 +ERPNEXT_VERSION=v15.55.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 933baa19..3b444241 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.55.0 + image: frappe/erpnext:v15.55.1 networks: - frappe_network deploy: From 3b8fc30eb6b58b84f87527fa2d98088609e14cf5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Mar 2025 06:56:13 +0000 Subject: [PATCH 22/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 97ef72ab..718e4f59 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.55.1 +ERPNEXT_VERSION=v15.55.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3b444241..fb7c16d0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.55.1 + image: frappe/erpnext:v15.55.2 networks: - frappe_network deploy: From 1ac237df493a26577e98ee2eb81185801d876b2b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Mar 2025 07:53:58 +0000 Subject: [PATCH 23/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 718e4f59..906a4080 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.55.2 +ERPNEXT_VERSION=v15.55.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index fb7c16d0..f92981aa 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.55.2 + image: frappe/erpnext:v15.55.3 networks: - frappe_network deploy: From 0742a291054a0dd9454304b309376bb9178b9699 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Mar 2025 20:57:46 +0000 Subject: [PATCH 24/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 906a4080..d918598e 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.55.3 +ERPNEXT_VERSION=v15.55.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f92981aa..1d83f0a2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.55.3 + image: frappe/erpnext:v15.55.4 networks: - frappe_network deploy: From e6f7deec5cb688e8b43a56223f9c2d624b187c63 Mon Sep 17 00:00:00 2001 From: Reuel Ramos Ribeiro Date: Tue, 1 Apr 2025 08:02:19 -0300 Subject: [PATCH 25/45] Update development.md (#1600) Clarify documentation about error. Solution was found at: https://discuss.frappe.io/t/youre-attempting-to-install-erpnext-version-15-with-frappe-version-16-this-is-not-supported-and-wi/127422 --- docs/development.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/development.md b/docs/development.md index 1d862231..8bdeb4f8 100644 --- a/docs/development.md +++ b/docs/development.md @@ -221,6 +221,11 @@ bench --site development.localhost install-app erpnext ``` Note: Both frappe and erpnext must be on branch with same name. e.g. version-14 +You can use the `switch-to-branch` command to align versions if you get an error about mismatching versions. + +```shell +bench switch-to-branch version-xx +``` ### Start Frappe without debugging From 07de17ea8988508283fb0401ea23a8de92b808ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Apr 2025 06:03:33 +0000 Subject: [PATCH 26/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index d918598e..f8fa0042 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.55.4 +ERPNEXT_VERSION=v15.55.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 1d83f0a2..f6eabe94 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.55.4 + image: frappe/erpnext:v15.55.5 networks: - frappe_network deploy: From e4a97a9e116a2f155e8be6874e52fcce7b79c732 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Apr 2025 13:56:14 +0000 Subject: [PATCH 27/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index f8fa0042..b041fcf9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.55.5 +ERPNEXT_VERSION=v15.56.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f6eabe94..3652290e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.55.5 + image: frappe/erpnext:v15.56.0 networks: - frappe_network deploy: From c5b065e9f19270cb484fdba057c7da51a8a1599a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Apr 2025 08:22:22 +0000 Subject: [PATCH 28/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index b041fcf9..1fc9a063 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.56.0 +ERPNEXT_VERSION=v15.57.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3652290e..c01d8b6f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.56.0 + image: frappe/erpnext:v15.57.0 networks: - frappe_network deploy: From ab3d378b7d153e41ef4bedcef3c89264359b2400 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Apr 2025 13:13:09 +0000 Subject: [PATCH 29/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 1fc9a063..bc7a426c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.57.0 +ERPNEXT_VERSION=v15.57.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c01d8b6f..cfa62855 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.57.0 + image: frappe/erpnext:v15.57.1 networks: - frappe_network deploy: From ccd095535bedb212c35ea8cca5aa57c8ae1d56eb Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Apr 2025 16:06:24 +0000 Subject: [PATCH 30/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index bc7a426c..8488fd7c 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.57.1 +ERPNEXT_VERSION=v15.57.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index cfa62855..c0fd5374 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.57.1 + image: frappe/erpnext:v15.57.2 networks: - frappe_network deploy: From bd8912c90dea964606fb5635dbb44c704c4d2920 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Apr 2025 02:54:12 +0000 Subject: [PATCH 31/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 8488fd7c..6e7ddaae 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.57.2 +ERPNEXT_VERSION=v15.57.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c0fd5374..3ad35cda 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.57.2 + image: frappe/erpnext:v15.57.3 networks: - frappe_network deploy: From b5cfe3f735a3d19b27a2c13e04ebb73eb88314e9 Mon Sep 17 00:00:00 2001 From: Reuel Ramos Ribeiro Date: Sat, 12 Apr 2025 02:36:57 -0300 Subject: [PATCH 32/45] chore: Update vscode-example scripts (#1613) * chore: Add tasks.json file * refactor: Remove deprecated pythonPath; redundant with settings.json anyway. * fix: Use expected type for python debug * feat: Run post clean task in seamless way * feat: Add compunds config for easier setup * style: Trigger pre-commit lint * fix: honcho python environment in vscode launch.json * fix: pre-commit prettier check --------- Co-authored-by: Revant Nandgaonkar --- development/vscode-example/launch.json | 31 ++++++++++++-------------- development/vscode-example/tasks.json | 22 ++++++++++++++++++ 2 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 development/vscode-example/tasks.json diff --git a/development/vscode-example/launch.json b/development/vscode-example/launch.json index e3100c7a..46c886a4 100644 --- a/development/vscode-example/launch.json +++ b/development/vscode-example/launch.json @@ -6,7 +6,7 @@ "configurations": [ { "name": "Bench Web", - "type": "python", + "type": "debugpy", "request": "launch", "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", "args": [ @@ -17,7 +17,6 @@ "--noreload", "--nothreading" ], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench/sites", "env": { "DEV_SERVER": "1" @@ -25,11 +24,10 @@ }, { "name": "Bench Short Worker", - "type": "python", + "type": "debugpy", "request": "launch", "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", "args": ["frappe", "worker", "--queue", "short"], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench/sites", "env": { "DEV_SERVER": "1" @@ -37,11 +35,10 @@ }, { "name": "Bench Long Worker", - "type": "python", + "type": "debugpy", "request": "launch", "program": "${workspaceFolder}/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", "args": ["frappe", "worker", "--queue", "long"], - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench/sites", "env": { "DEV_SERVER": "1" @@ -49,21 +46,21 @@ }, { "name": "Honcho SocketIO Watch Schedule Worker", - "type": "python", + "type": "debugpy", "request": "launch", + "python": "/home/frappe/.pyenv/shims/python", "program": "/home/frappe/.local/bin/honcho", - "pythonPath": "${workspaceFolder}/frappe-bench/env/bin/python", "cwd": "${workspaceFolder}/frappe-bench", "console": "internalConsole", - "args": [ - "start", - "socketio", - "watch", - "schedule", - "worker_short", - "worker_long", - "worker_default" - ] + "args": ["start", "socketio", "watch", "schedule", "worker"], + "postDebugTask": "Clean Honcho SocketIO Watch Schedule Worker" + } + ], + "compounds": [ + { + "name": "Honcho + Web debug", + "configurations": ["Bench Web", "Honcho SocketIO Watch Schedule Worker"], + "stopAll": true } ] } diff --git a/development/vscode-example/tasks.json b/development/vscode-example/tasks.json new file mode 100644 index 00000000..7c0e6739 --- /dev/null +++ b/development/vscode-example/tasks.json @@ -0,0 +1,22 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Clean Honcho SocketIO Watch Schedule Worker", + "detail": "When stopping the debug process from vscode window, the honcho won't receive the SIGINT signal. This task will send the SIGINT signal to the honcho processes.", + "type": "shell", + "command": "pkill -SIGINT -f bench; pkill -SIGINT -f socketio", + "isBackground": false, + "presentation": { + "echo": true, + "reveal": "silent", + "focus": false, + "panel": "shared", + "showReuseMessage": false, + "close": true + } + } + ] +} From 28d6a2de15ee1853eeb3b99f0db2f3cb4f40b31d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 13 Apr 2025 15:03:20 +0000 Subject: [PATCH 33/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 6e7ddaae..c1e9c655 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.57.3 +ERPNEXT_VERSION=v15.57.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3ad35cda..5344a44c 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.57.3 + image: frappe/erpnext:v15.57.4 networks: - frappe_network deploy: From 2743ed1f67841528e4df7f922894c740c0afe320 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 14 Apr 2025 09:13:54 +0000 Subject: [PATCH 34/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index c1e9c655..4f85a138 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.57.4 +ERPNEXT_VERSION=v15.57.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 5344a44c..ea8f9cdc 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.57.4 + image: frappe/erpnext:v15.57.5 networks: - frappe_network deploy: From b29e703427ff1ad3acb79cd12625573383bdca20 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Apr 2025 04:51:55 +0000 Subject: [PATCH 35/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 4f85a138..1e2c44b9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.57.5 +ERPNEXT_VERSION=v15.58.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ea8f9cdc..8e92b3e4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.57.5 + image: frappe/erpnext:v15.58.0 networks: - frappe_network deploy: From eb249f13a00c7233e24917b6b319aad202967b8b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Apr 2025 06:05:05 +0000 Subject: [PATCH 36/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 1e2c44b9..948118d7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.58.0 +ERPNEXT_VERSION=v15.58.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 8e92b3e4..de6ec4f2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.58.0 + image: frappe/erpnext:v15.58.1 networks: - frappe_network deploy: From 3d7fc5378e46c99b5bc4a55a765256c2867850b5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 17 Apr 2025 11:44:27 +0000 Subject: [PATCH 37/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 948118d7..a4edbabe 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.58.1 +ERPNEXT_VERSION=v15.58.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index de6ec4f2..d4779474 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.58.1 + image: frappe/erpnext:v15.58.2 networks: - frappe_network deploy: From 0f57e9815e979dcaa34c49d31125a562887e2d4f Mon Sep 17 00:00:00 2001 From: Md Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com> Date: Mon, 21 Apr 2025 18:27:22 +0200 Subject: [PATCH 38/45] chore: change short link --- images/production/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/production/Containerfile b/images/production/Containerfile index 7f36e0ed..69d7250e 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -122,7 +122,7 @@ FROM base AS erpnext USER frappe -RUN echo "echo \"Commands restricted in prodution container, Read FAQ before you proceed: https://frappe.fyi/ctr-faq\"" >> ~/.bashrc +RUN echo "echo \"Commands restricted in prodution container, Read FAQ before you proceed: https://frappe.io/ctr-faq\"" >> ~/.bashrc COPY --from=builder --chown=frappe:frappe /home/frappe/frappe-bench /home/frappe/frappe-bench From 901a30b1249be82dd0b6115e5354bdcefa043905 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Apr 2025 14:36:09 +0000 Subject: [PATCH 39/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index a4edbabe..a747a61b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.58.2 +ERPNEXT_VERSION=v15.59.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d4779474..960ef8bd 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.58.2 + image: frappe/erpnext:v15.59.0 networks: - frappe_network deploy: From 2e7322f23dc24f4438c99c1ce55ca0d83749dbbe Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 29 Apr 2025 13:58:40 +0000 Subject: [PATCH 40/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index a747a61b..c6e1fb28 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.59.0 +ERPNEXT_VERSION=v15.60.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 960ef8bd..ee86a293 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.59.0 + image: frappe/erpnext:v15.60.0 networks: - frappe_network deploy: From 7d4d0b18f4f1ad318b9d70b71fd229eff3c6874e Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 2 May 2025 14:34:01 +0000 Subject: [PATCH 41/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index c6e1fb28..423499b6 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.60.0 +ERPNEXT_VERSION=v15.60.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index ee86a293..4049310d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.60.0 + image: frappe/erpnext:v15.60.1 networks: - frappe_network deploy: From aa4ae4d18371794afd33e2b1a4bda89495151dcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 13:24:06 +0530 Subject: [PATCH 42/45] chore(deps): bump docker/bake-action from 6.5.0 to 6.6.0 (#1619) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 6.5.0 to 6.6.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v6.5.0...v6.6.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-version: 6.6.0 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 f7bf4c09..772c56ee 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v6.5.0 + uses: docker/bake-action@v6.6.0 with: source: . targets: bench-test @@ -52,7 +52,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v6.5.0 + uses: docker/bake-action@v6.6.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index ffccb67c..90415dfd 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -66,7 +66,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v6.5.0 + uses: docker/bake-action@v6.6.0 with: source: . push: true @@ -95,7 +95,7 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v6.5.0 + uses: docker/bake-action@v6.6.0 with: push: true set: "*.platform=linux/amd64,linux/arm64" From e104c0b4ea62e56de1e583a6e5b24a57f04383b3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 6 May 2025 15:02:16 +0000 Subject: [PATCH 43/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 423499b6..1c3743e8 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.60.1 +ERPNEXT_VERSION=v15.60.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 4049310d..d8e3938c 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.60.1 + image: frappe/erpnext:v15.60.2 networks: - frappe_network deploy: From 340e09d248c3f9186d49f2878dc96ff001022a6a Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 13 May 2025 14:52:00 +0000 Subject: [PATCH 44/45] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 1c3743e8..3902f223 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.60.2 +ERPNEXT_VERSION=v15.61.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d8e3938c..b3d41cac 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.60.2 + image: frappe/erpnext:v15.61.0 networks: - frappe_network deploy: From 65a0ac2e7f832fd8658fdf6378d9c6018e6764f6 Mon Sep 17 00:00:00 2001 From: Harmeet Singh Date: Tue, 13 May 2025 22:07:44 +0530 Subject: [PATCH 45/45] Update site-operations.md (#1627) Added note for -p in docker-compose exec command. https://github.com/frappe/frappe_docker/issues/927 --- docs/site-operations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/site-operations.md b/docs/site-operations.md index 08f1f159..550d9bdf 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -7,6 +7,7 @@ Note: - Wait for the `db` service to start and `configurator` to exit before trying to create a new site. Usually this takes up to 10 seconds. +- Also you have to pass `-p ` if `-p` passed previously eg. `docker-compose -p exec (rest of the command)`. ```sh docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password