From 00411f17dfc47feed10cd26ffd8bd2a58e1021dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:07:33 +0530 Subject: [PATCH 01/15] chore(deps): bump pytest from 8.3.3 to 8.3.4 (#1522) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.3 to 8.3.4. - [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.3...8.3.4) --- 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 40543aabab..d197ada2ff 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.3.3 +pytest==8.3.4 From 853ca71ac2514813794d0b183447c4fd7548582e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Dec 2024 04:46:07 +0000 Subject: [PATCH 02/15] 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 54ff0ef7b3..7968e014e2 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.44.0 +ERPNEXT_VERSION=v15.45.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index dc4cbcbf62..1baa1a2db7 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: none @@ -90,7 +90,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 depends_on: - websocket deploy: @@ -114,7 +114,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: on-failure @@ -128,7 +128,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: on-failure @@ -158,7 +158,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: on-failure @@ -170,7 +170,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.44.0 + image: frappe/erpnext:v15.45.0 deploy: restart_policy: condition: on-failure From ce06dac357e6aaea19c98c73152270c6734bfd47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:44:55 +0530 Subject: [PATCH 03/15] chore(deps): bump docker/bake-action from 5.10.0 to 5.11.0 (#1523) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.10.0 to 5.11.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.10.0...v5.11.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 6b4afeaf82..b05fbee8ac 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@v5.10.0 + uses: docker/bake-action@v5.11.0 with: targets: bench-test @@ -51,7 +51,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v5.10.0 + uses: docker/bake-action@v5.11.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index dac92bf10c..cf644f70fa 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@v5.10.0 + uses: docker/bake-action@v5.11.0 with: push: true env: @@ -91,6 +91,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.10.0 + uses: docker/bake-action@v5.11.0 with: push: true From 4745ea30cce7c7ac7cef1a5c80d1d404f19e1ca0 Mon Sep 17 00:00:00 2001 From: mz-h <125813388+mz-h@users.noreply.github.com> Date: Thu, 5 Dec 2024 01:17:03 -0500 Subject: [PATCH 04/15] Fix Connection Error (#1524) --- pwd.yml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/pwd.yml b/pwd.yml index 1baa1a2db7..3eb24472c7 100644 --- a/pwd.yml +++ b/pwd.yml @@ -3,22 +3,30 @@ version: "3" services: backend: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: on-failure volumes: - sites:/home/frappe/frappe-bench/sites - logs:/home/frappe/frappe-bench/logs + environment: + DB_HOST: db + DB_PORT: "3306" + MYSQL_ROOT_PASSWORD: admin + MARIADB_ROOT_PASSWORD: admin configurator: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: none entrypoint: - bash - -c - # add redis_socketio for backward compatibility command: - > ls -1 apps > sites/apps.txt; @@ -40,6 +48,8 @@ services: create-site: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: none @@ -71,6 +81,8 @@ services: db: image: mariadb:10.6 + networks: + - frappe_network healthcheck: test: mysqladmin ping -h localhost --password=admin interval: 1s @@ -91,6 +103,8 @@ services: frontend: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network depends_on: - websocket deploy: @@ -115,6 +129,8 @@ services: queue-long: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: on-failure @@ -129,6 +145,8 @@ services: queue-short: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: on-failure @@ -143,6 +161,8 @@ services: redis-queue: image: redis:6.2-alpine + networks: + - frappe_network deploy: restart_policy: condition: on-failure @@ -151,6 +171,8 @@ services: redis-cache: image: redis:6.2-alpine + networks: + - frappe_network deploy: restart_policy: condition: on-failure @@ -159,6 +181,8 @@ services: scheduler: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: on-failure @@ -171,6 +195,8 @@ services: websocket: image: frappe/erpnext:v15.45.0 + networks: + - frappe_network deploy: restart_policy: condition: on-failure @@ -187,3 +213,7 @@ volumes: redis-cache-data: sites: logs: + +networks: + frappe_network: + driver: bridge From c35d5e1d6c48df73d97f6e0b1182145e019d8e1d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Dec 2024 07:45:47 +0000 Subject: [PATCH 05/15] 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 7968e014e2..b028c1f64e 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.45.0 +ERPNEXT_VERSION=v15.45.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3eb24472c7..aee19a396e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: @@ -180,7 +180,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: @@ -194,7 +194,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.45.0 + image: frappe/erpnext:v15.45.1 networks: - frappe_network deploy: From e2ffe3b3fdb88a40cd49244652aa529378df0e33 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Dec 2024 08:28:00 +0000 Subject: [PATCH 06/15] 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 b028c1f64e..4fa1ccea2d 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.45.1 +ERPNEXT_VERSION=v15.45.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index aee19a396e..e5567de85f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: @@ -180,7 +180,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: @@ -194,7 +194,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.45.1 + image: frappe/erpnext:v15.45.2 networks: - frappe_network deploy: From beecd99686c534afc8971fbc95018c985ae5b050 Mon Sep 17 00:00:00 2001 From: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com> Date: Sat, 7 Dec 2024 12:59:14 +0100 Subject: [PATCH 07/15] fix: --no-mariadb-socket is DEPRECATED (#1525) --no-mariadb-socket is DEPRECATED; use --mariadb-user-host-login-scope='%' (wildcard) or --mariadb-user-host-login-scope=, instead. --- development/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/installer.py b/development/installer.py index 44aca431b5..f977b82214 100755 --- a/development/installer.py +++ b/development/installer.py @@ -209,7 +209,7 @@ def create_site_in_bench(args): "new-site", f"--db-host=mariadb", # Should match the compose service name f"--db-type={args.db_type}", # Add the selected database type - f"--no-mariadb-socket", + f"--mariadb-user-host-login-scope=%", f"--db-root-password=123", # Replace with your MariaDB password f"--admin-password={args.admin_password}", ] From 598c7dab4363a38fddcdcf71603ebff7223b1cfb Mon Sep 17 00:00:00 2001 From: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com> Date: Sat, 7 Dec 2024 15:30:46 +0100 Subject: [PATCH 08/15] fix: --no-mariadb-socket & --mariadb-root-password is DEPRECATED --- docs/development.md | 8 ++++---- docs/migrate-from-multi-image-setup.md | 4 ++-- docs/setup_for_linux_mac.md | 2 +- docs/single-server-example.md | 8 ++++---- docs/site-operations.md | 4 ++-- tests/conftest.py | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/development.md b/docs/development.md index 89b20ec2cb..1d862231b1 100644 --- a/docs/development.md +++ b/docs/development.md @@ -144,7 +144,7 @@ sed -i '/redis/d' ./Procfile You can create a new site with the following command: ```shell -bench new-site --no-mariadb-socket sitename +bench new-site --mariadb-user-host-login-scope=% sitename ``` sitename MUST end with .localhost for trying deployments locally. @@ -152,18 +152,18 @@ sitename MUST end with .localhost for trying deployments locally. for example: ```shell -bench new-site --no-mariadb-socket development.localhost +bench new-site --mariadb-user-host-login-scope=% development.localhost ``` The same command can be run non-interactively as well: ```shell -bench new-site --mariadb-root-password 123 --admin-password admin --no-mariadb-socket development.localhost +bench new-site --db-root-password 123 --admin-password admin --mariadb-user-host-login-scope=% development.localhost ``` The command will ask the MariaDB root password. The default root password is `123`. This will create a new site and a `development.localhost` directory under `frappe-bench/sites`. -The option `--no-mariadb-socket` will configure site's database credentials to work with docker. +The option `--mariadb-user-host-login-scope=%` will configure site's database credentials to work with docker. You may need to configure your system /etc/hosts if you're on Linux, Mac, or its Windows equivalent. To setup site with PostgreSQL as database use option `--db-type postgres` and `--db-host postgresql`. (Available only v12 onwards, currently NOT available for ERPNext). diff --git a/docs/migrate-from-multi-image-setup.md b/docs/migrate-from-multi-image-setup.md index 79072b0d94..0e3c640cc0 100644 --- a/docs/migrate-from-multi-image-setup.md +++ b/docs/migrate-from-multi-image-setup.md @@ -74,7 +74,7 @@ configurator: ### Site Creation -For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--no-mariadb-socket` as upstream bench is installed in container. +For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--mariadb-user-host-login-scope=%` as upstream bench is installed in container. The `WORKDIR` has changed to `/home/frappe/frappe-bench` like `bench` setup we are used to. So the path to find `common_site_config.json` has changed to `sites/common_site_config.json`. @@ -106,7 +106,7 @@ create-site: fi done; echo "sites/common_site_config.json found"; - bench new-site --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; # ... removed for brevity ``` diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index b26cef48fc..ba720fbb0b 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -83,7 +83,7 @@ services: fi done; echo "sites/common_site_config.json found"; - bench new-site --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; db: image: mariadb:10.6 diff --git a/docs/single-server-example.md b/docs/single-server-example.md index 1bc2c2b160..ca61cda1ac 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -177,7 +177,7 @@ Create sites `one.example.com` and `two.example.com`: ```shell # one.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit one.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit one.example.com ``` You can stop here and have a single bench single site setup complete. Continue to add one more site to the current bench. @@ -185,7 +185,7 @@ You can stop here and have a single bench single site setup complete. Continue t ```shell # two.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit two.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit two.example.com ``` #### Create second bench @@ -236,10 +236,10 @@ Create sites `three.example.com` and `four.example.com`: ```shell # three.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit three.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit three.example.com # four.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site --no-mariadb-socket --mariadb-root-password changeit --install-app erpnext --admin-password changeit four.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit four.example.com ``` #### Create custom domain to existing site diff --git a/docs/site-operations.md b/docs/site-operations.md index 793dfef5ec..08f1f1595b 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -9,7 +9,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. ```sh -docker-compose exec backend bench new-site --no-mariadb-socket --mariadb-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`. @@ -24,7 +24,7 @@ docker-compose exec backend bench set-config -g root_password Also command is slightly different: ```sh -docker-compose exec backend bench new-site --no-mariadb-socket --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 diff --git a/tests/conftest.py b/tests/conftest.py index 99470aa419..f2659f1693 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -71,8 +71,8 @@ def frappe_site(compose: Compose): site_name = "tests.localhost" compose.bench( "new-site", - "--no-mariadb-socket", - "--mariadb-root-password", + "--mariadb-user-host-login-scope=%", + "--db-root-password", "123", "--admin-password", "admin", @@ -96,8 +96,8 @@ def erpnext_site(compose: Compose): site_name = "test-erpnext-site.localhost" args = [ "new-site", - "--no-mariadb-socket", - "--mariadb-root-password", + "--mariadb-user-host-login-scope=%", + "--db-root-password", "123", "--admin-password", "admin", From c9aa1f179a5fdddedd7515fc7baeeebb67877343 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 Dec 2024 09:33:09 +0000 Subject: [PATCH 09/15] 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 4fa1ccea2d..2a4deef9eb 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.45.2 +ERPNEXT_VERSION=v15.45.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e5567de85f..4a20cfb784 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: @@ -180,7 +180,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: @@ -194,7 +194,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.45.2 + image: frappe/erpnext:v15.45.3 networks: - frappe_network deploy: From 13db302a0849e46db73bea4806f438e38b846006 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 Dec 2024 11:10:57 +0000 Subject: [PATCH 10/15] 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 2a4deef9eb..20baf947bc 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.45.3 +ERPNEXT_VERSION=v15.45.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 4a20cfb784..f269b010ad 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: @@ -180,7 +180,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: @@ -194,7 +194,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.45.3 + image: frappe/erpnext:v15.45.4 networks: - frappe_network deploy: From 1505d125f19f366f242b5f27f26f65283a6a0dc1 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 10 Dec 2024 15:36:18 +0530 Subject: [PATCH 11/15] fix: quote percent as mentioned in bench help --- development/installer.py | 2 +- docs/development.md | 8 ++++---- docs/migrate-from-multi-image-setup.md | 4 ++-- docs/setup_for_linux_mac.md | 2 +- docs/single-server-example.md | 8 ++++---- docs/site-operations.md | 4 ++-- tests/conftest.py | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/development/installer.py b/development/installer.py index f977b82214..a2fe35d428 100755 --- a/development/installer.py +++ b/development/installer.py @@ -209,7 +209,7 @@ def create_site_in_bench(args): "new-site", 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=%", + f"--mariadb-user-host-login-scope='%'", f"--db-root-password=123", # Replace with your MariaDB password f"--admin-password={args.admin_password}", ] diff --git a/docs/development.md b/docs/development.md index 1d862231b1..4ec6a1a075 100644 --- a/docs/development.md +++ b/docs/development.md @@ -144,7 +144,7 @@ sed -i '/redis/d' ./Procfile You can create a new site with the following command: ```shell -bench new-site --mariadb-user-host-login-scope=% sitename +bench new-site --mariadb-user-host-login-scope='%' sitename ``` sitename MUST end with .localhost for trying deployments locally. @@ -152,18 +152,18 @@ sitename MUST end with .localhost for trying deployments locally. for example: ```shell -bench new-site --mariadb-user-host-login-scope=% development.localhost +bench new-site --mariadb-user-host-login-scope='%' development.localhost ``` The same command can be run non-interactively as well: ```shell -bench new-site --db-root-password 123 --admin-password admin --mariadb-user-host-login-scope=% development.localhost +bench new-site --db-root-password 123 --admin-password admin --mariadb-user-host-login-scope='%' development.localhost ``` The command will ask the MariaDB root password. The default root password is `123`. This will create a new site and a `development.localhost` directory under `frappe-bench/sites`. -The option `--mariadb-user-host-login-scope=%` will configure site's database credentials to work with docker. +The option `--mariadb-user-host-login-scope='%'` will configure site's database credentials to work with docker. You may need to configure your system /etc/hosts if you're on Linux, Mac, or its Windows equivalent. To setup site with PostgreSQL as database use option `--db-type postgres` and `--db-host postgresql`. (Available only v12 onwards, currently NOT available for ERPNext). diff --git a/docs/migrate-from-multi-image-setup.md b/docs/migrate-from-multi-image-setup.md index 0e3c640cc0..62822ebd63 100644 --- a/docs/migrate-from-multi-image-setup.md +++ b/docs/migrate-from-multi-image-setup.md @@ -74,7 +74,7 @@ configurator: ### Site Creation -For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--mariadb-user-host-login-scope=%` as upstream bench is installed in container. +For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--mariadb-user-host-login-scope='%'` as upstream bench is installed in container. The `WORKDIR` has changed to `/home/frappe/frappe-bench` like `bench` setup we are used to. So the path to find `common_site_config.json` has changed to `sites/common_site_config.json`. @@ -106,7 +106,7 @@ create-site: fi done; echo "sites/common_site_config.json found"; - bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; # ... removed for brevity ``` diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index ba720fbb0b..dc2d73b1e0 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -83,7 +83,7 @@ services: fi done; echo "sites/common_site_config.json found"; - bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; db: image: mariadb:10.6 diff --git a/docs/single-server-example.md b/docs/single-server-example.md index ca61cda1ac..d199114aaa 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -177,7 +177,7 @@ Create sites `one.example.com` and `two.example.com`: ```shell # one.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit one.example.com + bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit one.example.com ``` You can stop here and have a single bench single site setup complete. Continue to add one more site to the current bench. @@ -185,7 +185,7 @@ You can stop here and have a single bench single site setup complete. Continue t ```shell # two.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit two.example.com + bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit two.example.com ``` #### Create second bench @@ -236,10 +236,10 @@ Create sites `three.example.com` and `four.example.com`: ```shell # three.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit three.example.com + bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit three.example.com # four.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit four.example.com + bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit four.example.com ``` #### Create custom domain to existing site diff --git a/docs/site-operations.md b/docs/site-operations.md index 08f1f1595b..58c9653f6a 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -9,7 +9,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. ```sh -docker-compose 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`. @@ -24,7 +24,7 @@ docker-compose 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-compose exec backend bench new-site --mariadb-user-host-login-scope='%' --db-type postgres --admin-password ``` ## Push backup to S3 storage diff --git a/tests/conftest.py b/tests/conftest.py index f2659f1693..5f32a8432d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -71,7 +71,7 @@ def frappe_site(compose: Compose): site_name = "tests.localhost" compose.bench( "new-site", - "--mariadb-user-host-login-scope=%", + "--mariadb-user-host-login-scope='%'", "--db-root-password", "123", "--admin-password", @@ -96,7 +96,7 @@ def erpnext_site(compose: Compose): site_name = "test-erpnext-site.localhost" args = [ "new-site", - "--mariadb-user-host-login-scope=%", + "--mariadb-user-host-login-scope='%'", "--db-root-password", "123", "--admin-password", From 85e164f34c4d1926298864bfac32232b7463a9d6 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 10 Dec 2024 15:48:00 +0530 Subject: [PATCH 12/15] revert: quote percent as mentioned in bench help --- development/installer.py | 2 +- docs/development.md | 8 ++++---- docs/migrate-from-multi-image-setup.md | 4 ++-- docs/setup_for_linux_mac.md | 2 +- docs/single-server-example.md | 8 ++++---- docs/site-operations.md | 4 ++-- tests/conftest.py | 10 ++++------ 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/development/installer.py b/development/installer.py index a2fe35d428..f977b82214 100755 --- a/development/installer.py +++ b/development/installer.py @@ -209,7 +209,7 @@ def create_site_in_bench(args): "new-site", 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='%'", + f"--mariadb-user-host-login-scope=%", f"--db-root-password=123", # Replace with your MariaDB password f"--admin-password={args.admin_password}", ] diff --git a/docs/development.md b/docs/development.md index 4ec6a1a075..1d862231b1 100644 --- a/docs/development.md +++ b/docs/development.md @@ -144,7 +144,7 @@ sed -i '/redis/d' ./Procfile You can create a new site with the following command: ```shell -bench new-site --mariadb-user-host-login-scope='%' sitename +bench new-site --mariadb-user-host-login-scope=% sitename ``` sitename MUST end with .localhost for trying deployments locally. @@ -152,18 +152,18 @@ sitename MUST end with .localhost for trying deployments locally. for example: ```shell -bench new-site --mariadb-user-host-login-scope='%' development.localhost +bench new-site --mariadb-user-host-login-scope=% development.localhost ``` The same command can be run non-interactively as well: ```shell -bench new-site --db-root-password 123 --admin-password admin --mariadb-user-host-login-scope='%' development.localhost +bench new-site --db-root-password 123 --admin-password admin --mariadb-user-host-login-scope=% development.localhost ``` The command will ask the MariaDB root password. The default root password is `123`. This will create a new site and a `development.localhost` directory under `frappe-bench/sites`. -The option `--mariadb-user-host-login-scope='%'` will configure site's database credentials to work with docker. +The option `--mariadb-user-host-login-scope=%` will configure site's database credentials to work with docker. You may need to configure your system /etc/hosts if you're on Linux, Mac, or its Windows equivalent. To setup site with PostgreSQL as database use option `--db-type postgres` and `--db-host postgresql`. (Available only v12 onwards, currently NOT available for ERPNext). diff --git a/docs/migrate-from-multi-image-setup.md b/docs/migrate-from-multi-image-setup.md index 62822ebd63..0e3c640cc0 100644 --- a/docs/migrate-from-multi-image-setup.md +++ b/docs/migrate-from-multi-image-setup.md @@ -74,7 +74,7 @@ configurator: ### Site Creation -For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--mariadb-user-host-login-scope='%'` as upstream bench is installed in container. +For `create-site` service to act as run once site creation job, you need to pass `["bash", "-c"]` as container `entrypoint` and bash script inline to yaml. Make sure to use `--mariadb-user-host-login-scope=%` as upstream bench is installed in container. The `WORKDIR` has changed to `/home/frappe/frappe-bench` like `bench` setup we are used to. So the path to find `common_site_config.json` has changed to `sites/common_site_config.json`. @@ -106,7 +106,7 @@ create-site: fi done; echo "sites/common_site_config.json found"; - bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; # ... removed for brevity ``` diff --git a/docs/setup_for_linux_mac.md b/docs/setup_for_linux_mac.md index dc2d73b1e0..ba720fbb0b 100644 --- a/docs/setup_for_linux_mac.md +++ b/docs/setup_for_linux_mac.md @@ -83,7 +83,7 @@ services: fi done; echo "sites/common_site_config.json found"; - bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; + bench new-site --mariadb-user-host-login-scope=% --admin-password=admin --db-root-password=admin --install-app erpnext --set-default frontend; db: image: mariadb:10.6 diff --git a/docs/single-server-example.md b/docs/single-server-example.md index d199114aaa..ca61cda1ac 100644 --- a/docs/single-server-example.md +++ b/docs/single-server-example.md @@ -177,7 +177,7 @@ Create sites `one.example.com` and `two.example.com`: ```shell # one.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit one.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit one.example.com ``` You can stop here and have a single bench single site setup complete. Continue to add one more site to the current bench. @@ -185,7 +185,7 @@ You can stop here and have a single bench single site setup complete. Continue t ```shell # two.example.com docker compose --project-name erpnext-one exec backend \ - bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit two.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit two.example.com ``` #### Create second bench @@ -236,10 +236,10 @@ Create sites `three.example.com` and `four.example.com`: ```shell # three.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit three.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit three.example.com # four.example.com docker compose --project-name erpnext-two exec backend \ - bench new-site --mariadb-user-host-login-scope='%' --db-root-password changeit --install-app erpnext --admin-password changeit four.example.com + bench new-site --mariadb-user-host-login-scope=% --db-root-password changeit --install-app erpnext --admin-password changeit four.example.com ``` #### Create custom domain to existing site diff --git a/docs/site-operations.md b/docs/site-operations.md index 58c9653f6a..08f1f1595b 100644 --- a/docs/site-operations.md +++ b/docs/site-operations.md @@ -9,7 +9,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. ```sh -docker-compose 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`. @@ -24,7 +24,7 @@ docker-compose 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-compose exec backend bench new-site --mariadb-user-host-login-scope=% --db-type postgres --admin-password ``` ## Push backup to S3 storage diff --git a/tests/conftest.py b/tests/conftest.py index 5f32a8432d..42cdac1dcf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -71,11 +71,9 @@ def frappe_site(compose: Compose): site_name = "tests.localhost" compose.bench( "new-site", - "--mariadb-user-host-login-scope='%'", - "--db-root-password", - "123", - "--admin-password", - "admin", + "--mariadb-user-host-login-scope=%", + "--db-root-password=123", + "--admin-password=admin", site_name, ) compose("restart", "backend") @@ -96,7 +94,7 @@ def erpnext_site(compose: Compose): site_name = "test-erpnext-site.localhost" args = [ "new-site", - "--mariadb-user-host-login-scope='%'", + "--mariadb-user-host-login-scope=%", "--db-root-password", "123", "--admin-password", From 46c213b1c85d175bb3aa5e728fb02239f1a06444 Mon Sep 17 00:00:00 2001 From: Vlad Sorokin <30412774+parabolabam@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:43:28 +0400 Subject: [PATCH 13/15] fix: add quotes into command (#1527) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b68905a58a..9f0c5c44b9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Then run: `docker compose -f pwd.yml up -d` After cloning the repo run this command to build multi-architecture images specifically for ARM64. -`docker buildx bake --no-cache --set *.platform=linux/arm64` +`docker buildx bake --no-cache --set "*.platform=linux/arm64"` and then From 65c4f28ffd3f2fc315a44916e9fc355f16fdb86e Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 10 Dec 2024 16:26:59 +0530 Subject: [PATCH 14/15] fix: tests --- tests/conftest.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 42cdac1dcf..55838c6bb1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -71,7 +71,8 @@ def frappe_site(compose: Compose): site_name = "tests.localhost" compose.bench( "new-site", - "--mariadb-user-host-login-scope=%", + # TODO: change to --mariadb-user-host-login-scope=% + "--no-mariadb-socket", "--db-root-password=123", "--admin-password=admin", site_name, @@ -94,13 +95,11 @@ def erpnext_site(compose: Compose): site_name = "test-erpnext-site.localhost" args = [ "new-site", - "--mariadb-user-host-login-scope=%", - "--db-root-password", - "123", - "--admin-password", - "admin", - "--install-app", - "erpnext", + # TODO: change to --mariadb-user-host-login-scope=% + "--no-mariadb-socket", + "--db-root-password=123", + "--admin-password=admin", + "--install-app=erpnext", site_name, ] compose.bench(*args) From d8b6b6bcd5c4f6df1a786544b9da5d18e247af38 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Dec 2024 10:46:58 +0000 Subject: [PATCH 15/15] 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 20baf947bc..e4f2772c55 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.45.4 +ERPNEXT_VERSION=v15.45.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f269b010ad..8b805f98fb 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: @@ -180,7 +180,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: @@ -194,7 +194,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.45.4 + image: frappe/erpnext:v15.45.5 networks: - frappe_network deploy: