From 06fbff626e55871eb2bff50a3a356478630f37e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 Sep 2025 15:11:02 +0000 Subject: [PATCH 01/14] 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 e34d73cb..378a6324 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.78.0 +ERPNEXT_VERSION=v15.78.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 582603e5..c75ec63e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.78.0 + image: frappe/erpnext:v15.78.1 networks: - frappe_network deploy: From 520b00ac1b5bd2d310e4c7c1244d58b62e09e700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 07:29:03 +0530 Subject: [PATCH 02/14] chore(deps): bump actions/setup-go from 5 to 6 (#1691) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' 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/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4879c337..7e0b95c0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: # For shfmt pre-commit hook - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: "^1.14" From c2fb2055f04fa4d8ef010b1099a697d473f652bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 07:29:33 +0530 Subject: [PATCH 03/14] chore(deps): bump actions/setup-python from 5 to 6 (#1692) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '6' 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_stable.yml | 2 +- .github/workflows/docker-build-push.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index cd9e6139..6ddbb0ea 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -65,7 +65,7 @@ jobs: uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 2323cba7..d17dbf9e 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -74,7 +74,7 @@ jobs: REGISTRY_USER: localhost:5000/frappe - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7e0b95c0..6f72e86b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v5 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: "3.10.6" From 2f65520e14778df46f0c75fd6e1192c2106bb5e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 07:30:06 +0530 Subject: [PATCH 04/14] chore(deps): bump actions/stale from 9 to 10 (#1693) Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v9...v10) --- updated-dependencies: - dependency-name: actions/stale dependency-version: '10' 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/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 024ade1c..8849bfea 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v9 + - uses: actions/stale@v10 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: This issue has been automatically marked as stale. You have a week to explain why you believe this is an error. From 6e78467603a1d3cb44a2af34c4c794bf2966a68a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 07:30:37 +0530 Subject: [PATCH 05/14] chore(deps): bump pytest from 8.4.1 to 8.4.2 (#1694) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.4.1 to 8.4.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/8.4.1...8.4.2) --- updated-dependencies: - dependency-name: pytest dependency-version: 8.4.2 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 8e0e8841..9471b3d9 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.4.1 +pytest==8.4.2 From 2f5a42d864141216aa71dfa256e1ed18a0006c07 Mon Sep 17 00:00:00 2001 From: MeIchthys Date: Sat, 13 Sep 2025 02:54:41 -0400 Subject: [PATCH 06/14] Use `docker compose` instead of `docker-compose` (#1702) * Use `docker compose` instead of `docker-compose` Update to use new docker syntax. * use `docker` instead of `docker-compose` --- docs/site-operations.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/site-operations.md b/docs/site-operations.md index 550d9bdf..ef3b7b07 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -1,16 +1,16 @@ # Site operations -> 💡 You should setup `--project-name` option in `docker-compose` commands if you have non-standard project name. +> 💡 You should setup `--project-name` option in `docker` commands if you have non-standard project name. ## Setup new site 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)`. +- Also you have to pass `-p ` if `-p` passed previously eg. `docker -p exec (rest of the command)`. ```sh -docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password +docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password ``` If you need to install some app, specify `--install-app`. To see all options, just run `bench new-site --help`. @@ -18,14 +18,14 @@ If you need to install some app, specify `--install-app`. To see all options, ju To create Postgres site (assuming you already use [Postgres compose override](images-and-compose-files.md#overrides)) you need have to do set `root_login` and `root_password` in common config before that: ```sh -docker-compose exec backend bench set-config -g root_login -docker-compose exec backend bench set-config -g root_password +docker exec backend bench set-config -g root_login +docker exec backend bench set-config -g root_password ``` Also command is slightly different: ```sh -docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password +docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password ``` ## Push backup to S3 storage @@ -33,7 +33,7 @@ docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --d We have the script that helps to push latest backup to S3. ```sh -docker-compose exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key +docker exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key ``` Note that you can restore backup only manually. @@ -59,7 +59,7 @@ Instead of `alpine` use any image of your choice. For socketio and gunicorn service ping the hostname:port and that will be sufficient. For workers and scheduler, there is a command that needs to be executed. ```shell -docker-compose exec backend healthcheck.sh --ping-service mongodb:27017 +docker exec backend healthcheck.sh --ping-service mongodb:27017 ``` Additional services can be pinged as part of health check with option `-p` or `--ping-service`. @@ -72,7 +72,7 @@ If connection to service(s) fails, the command fails with exit code 1. For reference of commands like `backup`, `drop-site` or `migrate` check [official guide](https://frappeframework.com/docs/v13/user/en/bench/frappe-commands) or run: ```sh -docker-compose exec backend bench --help +docker exec backend bench --help ``` ## Migrate site @@ -82,5 +82,5 @@ Note: - Wait for the `db` service to start and `configurator` to exit before trying to migrate a site. Usually this takes up to 10 seconds. ```sh -docker-compose exec backend bench --site migrate +docker exec backend bench --site migrate ``` From b6e89163ecb6b15ff3057de52d82186c39442c30 Mon Sep 17 00:00:00 2001 From: MeIchthys Date: Mon, 15 Sep 2025 22:49:27 -0400 Subject: [PATCH 07/14] Revert "Use `docker compose` instead of `docker-compose` (#1702)" (#1708) This reverts commit 2f5a42d864141216aa71dfa256e1ed18a0006c07. --- docs/site-operations.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/site-operations.md b/docs/site-operations.md index ef3b7b07..550d9bdf 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -1,16 +1,16 @@ # Site operations -> 💡 You should setup `--project-name` option in `docker` commands if you have non-standard project name. +> 💡 You should setup `--project-name` option in `docker-compose` commands if you have non-standard project name. ## Setup new site 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 -p exec (rest of the command)`. +- Also you have to pass `-p ` if `-p` passed previously eg. `docker-compose -p exec (rest of the command)`. ```sh -docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password +docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-root-password --admin-password ``` If you need to install some app, specify `--install-app`. To see all options, just run `bench new-site --help`. @@ -18,14 +18,14 @@ If you need to install some app, specify `--install-app`. To see all options, ju To create Postgres site (assuming you already use [Postgres compose override](images-and-compose-files.md#overrides)) you need have to do set `root_login` and `root_password` in common config before that: ```sh -docker exec backend bench set-config -g root_login -docker exec backend bench set-config -g root_password +docker-compose exec backend bench set-config -g root_login +docker-compose exec backend bench set-config -g root_password ``` Also command is slightly different: ```sh -docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password +docker-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password ``` ## Push backup to S3 storage @@ -33,7 +33,7 @@ docker exec backend bench new-site --mariadb-user-host-login-scope=% --db-type p We have the script that helps to push latest backup to S3. ```sh -docker exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key +docker-compose exec backend push_backup.py --site-name --bucket --region-name --endpoint-url --aws-access-key-id --aws-secret-access-key ``` Note that you can restore backup only manually. @@ -59,7 +59,7 @@ Instead of `alpine` use any image of your choice. For socketio and gunicorn service ping the hostname:port and that will be sufficient. For workers and scheduler, there is a command that needs to be executed. ```shell -docker exec backend healthcheck.sh --ping-service mongodb:27017 +docker-compose exec backend healthcheck.sh --ping-service mongodb:27017 ``` Additional services can be pinged as part of health check with option `-p` or `--ping-service`. @@ -72,7 +72,7 @@ If connection to service(s) fails, the command fails with exit code 1. For reference of commands like `backup`, `drop-site` or `migrate` check [official guide](https://frappeframework.com/docs/v13/user/en/bench/frappe-commands) or run: ```sh -docker exec backend bench --help +docker-compose exec backend bench --help ``` ## Migrate site @@ -82,5 +82,5 @@ Note: - Wait for the `db` service to start and `configurator` to exit before trying to migrate a site. Usually this takes up to 10 seconds. ```sh -docker exec backend bench --site migrate +docker-compose exec backend bench --site migrate ``` From f8f806b3a70b0ae3e89786a117c786f765920720 Mon Sep 17 00:00:00 2001 From: Marc Ramser Date: Tue, 16 Sep 2025 09:09:26 +0200 Subject: [PATCH 08/14] Upgrade node version (#1706) --- .github/workflows/build_develop.yml | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index e37c5858..6103fd5f 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -27,7 +27,7 @@ jobs: version: develop push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} python_version: 3.11.6 - node_version: 18.18.2 + node_version: 20.19.2 secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/docker-bake.hcl b/docker-bake.hcl index 3304ce40..9d3ccd00 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -9,7 +9,7 @@ variable PYTHON_VERSION { default = "3.11.6" } variable NODE_VERSION { - default = "18.18.2" + default = "20.19.2" } variable "FRAPPE_VERSION" { From 67500fa79af9c1222db3174f6ff3a506afc6f145 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 Sep 2025 15:14:11 +0000 Subject: [PATCH 09/14] 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 378a6324..3dfec476 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.78.1 +ERPNEXT_VERSION=v15.79.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index c75ec63e..da18563f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.78.1 + image: frappe/erpnext:v15.79.0 networks: - frappe_network deploy: From 32f4fd315f4dce15aa0eb2555771780ba25fc476 Mon Sep 17 00:00:00 2001 From: Samar Singh <128586957+samarsingh6965@users.noreply.github.com> Date: Thu, 18 Sep 2025 04:43:41 +0530 Subject: [PATCH 10/14] =?UTF-8?q?Fix:=20Update=20PostgreSQL=2011.8=20?= =?UTF-8?q?=E2=86=92=2014=20for=20Frappe=20Site=20Creation=20(#1709)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update version of postgress in compose.yml file * fix(postgres): upgrade to v14 for COMMIT AND CHAIN support --------- Co-authored-by: abhirock74 --- devcontainer-example/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index 3df5c417..39f509d5 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -15,7 +15,7 @@ services: # Enable PostgreSQL only if you use it, see development/README.md for more information. # postgresql: - # image: postgres:11.8 + # image: postgres:14 # environment: # POSTGRES_PASSWORD: 123 # volumes: From c2679e20c3aef2d3cc39037801b297d7a8d09d14 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 21 Sep 2025 19:07:12 +0000 Subject: [PATCH 11/14] 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 3dfec476..5e7d447f 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.79.0 +ERPNEXT_VERSION=v15.79.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index da18563f..b1a63d19 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.79.0 + image: frappe/erpnext:v15.79.1 networks: - frappe_network deploy: From 0c59c8475c7b678e3e753726a96b32c341de7cd0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 23 Sep 2025 07:48:35 +0000 Subject: [PATCH 12/14] 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 5e7d447f..3fe006d3 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.79.1 +ERPNEXT_VERSION=v15.79.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index b1a63d19..5f7ea6c4 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.79.1 + image: frappe/erpnext:v15.79.2 networks: - frappe_network deploy: From 8b523ca12541ba003966a6f3e24a0edca1886c89 Mon Sep 17 00:00:00 2001 From: Niklas Liechti <2284764+nliechti@users.noreply.github.com> Date: Tue, 23 Sep 2025 10:00:48 +0200 Subject: [PATCH 13/14] Improve devcontainer behaviour on ARM Macs (#1707) * Remove hardcoded amd64 images. This slows down development on ARM Macs significantly. * Do not use prebuilt bench image as it may be outdated or not available as an ARM build. The source image is in this repo anyway. * Use the prebuilt image by default. --- devcontainer-example/docker-compose.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index 39f509d5..0a614cbf 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -2,7 +2,6 @@ version: "3.7" services: mariadb: image: docker.io/mariadb:10.6 - platform: linux/amd64 command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci @@ -38,15 +37,14 @@ services: redis-cache: image: docker.io/redis:alpine - platform: linux/amd64 redis-queue: image: docker.io/redis:alpine - platform: linux/amd64 frappe: image: docker.io/frappe/bench:latest - platform: linux/amd64 + # If you want to build the current bench image the Containerfile is in this Repo. + # build: ../images/bench command: sleep infinity environment: - SHELL=/bin/bash From 3b55b49cf8d9c7e85f694df2e98e608089ecf68c Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 23 Sep 2025 14:07:48 +0000 Subject: [PATCH 14/14] 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 3fe006d3..103f761b 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.79.2 +ERPNEXT_VERSION=v15.80.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 5f7ea6c4..bd0e52c2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.79.2 + image: frappe/erpnext:v15.80.0 networks: - frappe_network deploy: