From dd18f558a4bb9bf8094bf836dfcb4c7dd0c17bce Mon Sep 17 00:00:00 2001 From: github-actions <github-actions@github.com> Date: Wed, 25 Sep 2024 04:47:36 +0000 Subject: [PATCH 1/7] 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 c146d97c..37806633 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.36.1 +ERPNEXT_VERSION=v15.36.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2b4db8d2..f4eed91d 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.1 + image: frappe/erpnext:v15.36.2 deploy: restart_policy: condition: on-failure From 5f815d88a965dc11910e6fb88e3a6b00e1cf00e0 Mon Sep 17 00:00:00 2001 From: gp <370905+gparent@users.noreply.github.com> Date: Thu, 26 Sep 2024 03:20:18 -0400 Subject: [PATCH 2/7] Update Traefik container from deprecated v2.6 to v2.11 (#1475) --- overrides/compose.https.yaml | 2 +- overrides/compose.proxy.yaml | 2 +- overrides/compose.traefik.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/overrides/compose.https.yaml b/overrides/compose.https.yaml index aa17a68e..8d78602a 100644 --- a/overrides/compose.https.yaml +++ b/overrides/compose.https.yaml @@ -8,7 +8,7 @@ services: - traefik.http.routers.frontend-http.rule=Host(${SITES:?List of sites not set}) proxy: - image: traefik:2.5 + image: traefik:v2.11 command: - --providers.docker=true - --providers.docker.exposedbydefault=false diff --git a/overrides/compose.proxy.yaml b/overrides/compose.proxy.yaml index c887ffa5..32ce9fab 100644 --- a/overrides/compose.proxy.yaml +++ b/overrides/compose.proxy.yaml @@ -7,7 +7,7 @@ services: - traefik.http.routers.frontend-http.rule=HostRegexp(`{any:.+}`) proxy: - image: traefik:2.5 + image: traefik:v2.11 command: - --providers.docker - --providers.docker.exposedbydefault=false diff --git a/overrides/compose.traefik.yaml b/overrides/compose.traefik.yaml index 1e4432ff..25d362af 100644 --- a/overrides/compose.traefik.yaml +++ b/overrides/compose.traefik.yaml @@ -2,7 +2,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.6" + image: "traefik:v2.11" restart: unless-stopped labels: # Enable Traefik for this service, to make it available in the public network From 45259b4ebb6b25927ca71494c34e5c992841e4e2 Mon Sep 17 00:00:00 2001 From: github-actions <github-actions@github.com> Date: Fri, 27 Sep 2024 18:40:16 +0000 Subject: [PATCH 3/7] 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 37806633..54f6dcf7 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.36.2 +ERPNEXT_VERSION=v15.36.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f4eed91d..f40117d0 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.2 + image: frappe/erpnext:v15.36.3 deploy: restart_policy: condition: on-failure From d062ef035b061015abcfab1c9cc761b2194c389c Mon Sep 17 00:00:00 2001 From: github-actions <github-actions@github.com> Date: Sun, 29 Sep 2024 16:46:58 +0000 Subject: [PATCH 4/7] 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 54f6dcf7..bbea07eb 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.36.3 +ERPNEXT_VERSION=v15.36.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f40117d0..85c75cf6 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.3 + image: frappe/erpnext:v15.36.4 deploy: restart_policy: condition: on-failure From 111c8deb4a0ea909f3a4ec203e0b898d2f176aa0 Mon Sep 17 00:00:00 2001 From: github-actions <github-actions@github.com> Date: Mon, 30 Sep 2024 17:29:56 +0000 Subject: [PATCH 5/7] 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 bbea07eb..104b01fb 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.36.4 +ERPNEXT_VERSION=v15.37.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 85c75cf6..c4c1cc18 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.36.4 + image: frappe/erpnext:v15.37.0 deploy: restart_policy: condition: on-failure From f4fd057d0fcabd9bb375cf76012cb9b9210731ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:49:58 +0530 Subject: [PATCH 6/7] chore(deps): bump docker/bake-action from 5.7.0 to 5.8.0 (#1477) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.7.0 to 5.8.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.7.0...v5.8.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> 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 38a44733..94636143 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.7.0 + uses: docker/bake-action@v5.8.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.7.0 + uses: docker/bake-action@v5.8.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 72dee2bf..fe30fbea 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -56,7 +56,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v5.7.0 + uses: docker/bake-action@v5.8.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.7.0 + uses: docker/bake-action@v5.8.0 with: push: true From 41dd3fb110ab86193e75909c05766171cb53e0f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:37:34 +0530 Subject: [PATCH 7/7] chore(deps): bump docker/bake-action from 5.8.0 to 5.9.0 (#1478) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.8.0 to 5.9.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v5.8.0...v5.9.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> 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 94636143..acbe065a 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.8.0 + uses: docker/bake-action@v5.9.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.8.0 + uses: docker/bake-action@v5.9.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index fe30fbea..4dce5a1e 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -56,7 +56,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v5.8.0 + uses: docker/bake-action@v5.9.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v5.8.0 + uses: docker/bake-action@v5.9.0 with: push: true