From 8cf986b855e9e22d2f10efb2ed3833e320bfc641 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 4 Feb 2025 10:33:02 +0000 Subject: [PATCH 01/18] 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 115f3eaf..42d2875c 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.50.0 +ERPNEXT_VERSION=v15.50.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d54c7fc6..3ef7140f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.50.0 + image: frappe/erpnext:v15.50.1 networks: - frappe_network deploy: From 56e1da3f3747fa0827fdc4e252fe984a97e19b25 Mon Sep 17 00:00:00 2001 From: Amanuel Elhanan <69236638+elhananjair@users.noreply.github.com> Date: Tue, 4 Feb 2025 16:18:44 +0300 Subject: [PATCH 02/18] Autostart pod on system boot (#1561) * Autostart pod on system boot * ci: fix pre-commit --------- Co-authored-by: Revant Nandgaonkar --- docs/custom-apps-podman.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/custom-apps-podman.md b/docs/custom-apps-podman.md index 58717e64..765b9b7d 100644 --- a/docs/custom-apps-podman.md +++ b/docs/custom-apps-podman.md @@ -88,6 +88,29 @@ Podman (the POD MANager) is a tool for managing containers and images, volumes m - `bench new-site myerp.net --mariadb-root-password 123456 --admin-password 123123` - `bench --site myerp.net install-app erpnext` +## Autostart pod + +- Systemd is the best option on autostart pods when the system boots. Create a unit file in either `/etc/systemd/system` [for root user] or `~/.config/systemd/user` [for non-root user] + + ```ruby + [Unit] + Description=Podman system daemon service + After=network-online.target + + [Service] + #User= + #Group= + Type=oneshot + ExecStart=podman pod start POD_NAME + + + [Install] + WantedBy=default.target + + ``` + + **Note:** Replace POD_NAME with a created pod name while creating a pod. This is a basic systemd unit file to autostart pod, but multiple options can be used, refer to the man page for [systemd](https://man7.org/linux/man-pages/man1/init.1.html). For better management of containers, [Quadlet](https://docs.podman.io/en/v4.4/markdown/podman-systemd.unit.5.html) is the best option for ease of updating and tracing issues on each container. + ## Troubleshoot - If there is a network issue while building the image, you need to remove caches and restart again From fc955779f09ed22f551efacc9bd8233bb3774bdd Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Feb 2025 12:17:15 +0000 Subject: [PATCH 03/18] 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 42d2875c..ca628a31 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.50.1 +ERPNEXT_VERSION=v15.51.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 3ef7140f..e68830d5 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.50.1 + image: frappe/erpnext:v15.51.0 networks: - frappe_network deploy: From fcd69663cdc3602192d15149eb84643355d023c7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 7 Feb 2025 14:31:56 +0000 Subject: [PATCH 04/18] 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 ca628a31..2c054351 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.51.0 +ERPNEXT_VERSION=v15.51.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index e68830d5..71ac5859 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.51.0 + image: frappe/erpnext:v15.51.1 networks: - frappe_network deploy: From 0b3846bbb1943f76aea6401bbadc635e13e32e74 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 10 Feb 2025 16:37:53 +0000 Subject: [PATCH 05/18] 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 2c054351..de4e65ad 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.51.1 +ERPNEXT_VERSION=v15.51.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 71ac5859..dc691d05 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.51.1 + image: frappe/erpnext:v15.51.2 networks: - frappe_network deploy: From f6a5d223348173529031b3c4edd63a7068f6b609 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Feb 2025 12:17:34 +0000 Subject: [PATCH 06/18] 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 de4e65ad..986a0d05 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.51.2 +ERPNEXT_VERSION=v15.52.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index dc691d05..02142d5b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.51.2 + image: frappe/erpnext:v15.52.0 networks: - frappe_network deploy: From b904b2b8f791f181f707d7d6329493a606c38b4f Mon Sep 17 00:00:00 2001 From: DanielRadlAMR Date: Sat, 15 Feb 2025 07:33:57 +0100 Subject: [PATCH 07/18] Compose with restart (#1567) * added restart policy for critical sirvices * Update configurator restart policy * Added restart policy * Added restart policy * Added restart policy --- compose.yaml | 2 ++ overrides/compose.https.yaml | 1 + overrides/compose.mariadb.yaml | 1 + overrides/compose.redis.yaml | 2 ++ 4 files changed, 6 insertions(+) diff --git a/compose.yaml b/compose.yaml index 628de532..7c8e64f2 100644 --- a/compose.yaml +++ b/compose.yaml @@ -4,6 +4,7 @@ x-customizable-image: &customizable_image # about using custom images. image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-$ERPNEXT_VERSION} pull_policy: ${PULL_POLICY:-always} + restart: ${RESTART_POLICY:-unless-stopped} x-depends-on-configurator: &depends_on_configurator depends_on: @@ -39,6 +40,7 @@ services: REDIS_QUEUE: ${REDIS_QUEUE:-} SOCKETIO_PORT: 9000 depends_on: {} + restart: on-failure backend: <<: *backend_defaults diff --git a/overrides/compose.https.yaml b/overrides/compose.https.yaml index 8d78602a..9096e560 100644 --- a/overrides/compose.https.yaml +++ b/overrides/compose.https.yaml @@ -9,6 +9,7 @@ services: proxy: image: traefik:v2.11 + restart: unless-stopped command: - --providers.docker=true - --providers.docker.exposedbydefault=false diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml index 3dee180f..1d6e55c6 100644 --- a/overrides/compose.mariadb.yaml +++ b/overrides/compose.mariadb.yaml @@ -13,6 +13,7 @@ services: test: mysqladmin ping -h localhost --password=${DB_PASSWORD} interval: 1s retries: 20 + restart: unless-stopped command: - --character-set-server=utf8mb4 - --collation-server=utf8mb4_unicode_ci diff --git a/overrides/compose.redis.yaml b/overrides/compose.redis.yaml index a1b9b1f6..407ad9e1 100644 --- a/overrides/compose.redis.yaml +++ b/overrides/compose.redis.yaml @@ -9,9 +9,11 @@ services: redis-cache: image: redis:6.2-alpine + restart: unless-stopped redis-queue: image: redis:6.2-alpine + restart: unless-stopped volumes: - redis-queue-data:/data From c413fa8fa0a9685bac4120e53fcb66a97646e2e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Feb 2025 11:58:41 +0000 Subject: [PATCH 08/18] 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 986a0d05..7b0b4d1c 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.52.0 +ERPNEXT_VERSION=v15.53.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 02142d5b..1adf2e27 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.52.0 + image: frappe/erpnext:v15.53.0 networks: - frappe_network deploy: From a71dc70ed7ec1911c90a3f28da9edd7e11d70790 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 21 Feb 2025 10:11:32 +0000 Subject: [PATCH 09/18] 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 10/18] 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 11/18] 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 12/18] 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 13/18] 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 14/18] 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 15/18] 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 16/18] 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 17/18] 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 18/18] 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