From 2ee921f2b34102f106b40b7f693c66a93fe55c6e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Mar 2025 13:37:46 +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 80d6fd25..88cd9023 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.53.4 +ERPNEXT_VERSION=v15.54.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 390327c3..54dce928 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.53.4 + image: frappe/erpnext:v15.54.0 networks: - frappe_network deploy: From a9095fc46ae8b0902dd8184a2cfe97b31f70a9fc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 6 Mar 2025 11:14:58 +0000 Subject: [PATCH 2/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 88cd9023..3a8a07ab 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.0 +ERPNEXT_VERSION=v15.54.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 54dce928..2c538ca3 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.0 + image: frappe/erpnext:v15.54.1 networks: - frappe_network deploy: From 636e325006b0b572b513bbc1ebc001020fcb7641 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 8 Mar 2025 07:51:45 +0000 Subject: [PATCH 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 3a8a07ab..dad48b4b 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.1 +ERPNEXT_VERSION=v15.54.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 2c538ca3..7dd9b29f 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.1 + image: frappe/erpnext:v15.54.2 networks: - frappe_network deploy: From ffb4369af85009e9020875864f659c8f50923fe7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 9 Mar 2025 11:13:50 +0000 Subject: [PATCH 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 dad48b4b..742d3ee7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.2 +ERPNEXT_VERSION=v15.54.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 7dd9b29f..d9b0473e 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.2 + image: frappe/erpnext:v15.54.3 networks: - frappe_network deploy: From 9601c1615e17d34b5882c1742123df667e08cc17 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Mar 2025 14:47:09 +0000 Subject: [PATCH 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 742d3ee7..22315d59 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md -ERPNEXT_VERSION=v15.54.3 +ERPNEXT_VERSION=v15.54.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index d9b0473e..b12e9dbc 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -18,7 +18,7 @@ services: MARIADB_ROOT_PASSWORD: admin configurator: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -47,7 +47,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -102,7 +102,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network depends_on: @@ -128,7 +128,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -144,7 +144,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: @@ -192,7 +192,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.54.3 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: From 1e0fba995964f122445bae0caec7dce08f0ce2d7 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Thu, 13 Mar 2025 14:03:55 +0530 Subject: [PATCH 6/7] ci: for arm64 build frappe/erpnext like frappe/bench (#1587) --- .github/workflows/docker-build-push.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 8042a94c..fc189eff 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -45,14 +45,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up QEMU + - name: Setup QEMU uses: docker/setup-qemu-action@v3 + with: + image: tonistiigi/binfmt:latest + platforms: all - name: Setup Buildx uses: docker/setup-buildx-action@v3 - with: - driver-opts: network=host - platforms: linux/${{ matrix.arch }} - name: Get latest versions run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} @@ -95,3 +95,4 @@ jobs: uses: docker/bake-action@v6.5.0 with: push: true + set: "*.platform=linux/amd64,linux/arm64" From 02e24c9d2dd0db3319bca81d0cdf7de113c03f0a Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sat, 15 Mar 2025 19:07:33 +0530 Subject: [PATCH 7/7] build: add pkg-config deb package in build layer (#1590) * build: add pkg-config deb package in build layer * ci: only use tonistiigi/binfmt for image push * revert: arm64 builds * ci: copy build_bench to docker-build-push * ci: set driver-opts network=host for buildx action --- .github/workflows/docker-build-push.yml | 5 ++++- images/bench/Dockerfile | 1 + images/custom/Containerfile | 1 + images/production/Containerfile | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index fc189eff..ffccb67c 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest services: registry: - image: registry:2 + image: docker.io/registry:2 ports: - 5000:5000 strategy: @@ -53,6 +53,9 @@ jobs: - name: Setup Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host + platforms: linux/${{ matrix.arch }} - name: Get latest versions run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }} diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 8281e255..ba7641cf 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -47,6 +47,7 @@ RUN apt-get update \ libsasl2-dev \ libtiff5-dev \ libwebp-dev \ + pkg-config \ redis-tools \ rlwrap \ tk8.6-dev \ diff --git a/images/custom/Containerfile b/images/custom/Containerfile index a35b93fe..ff02845b 100644 --- a/images/custom/Containerfile +++ b/images/custom/Containerfile @@ -94,6 +94,7 @@ RUN apt-get update \ libsasl2-dev \ libtiff5-dev \ libwebp-dev \ + pkg-config \ redis-tools \ rlwrap \ tk8.6-dev \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 78c80f73..7f36e0ed 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -86,6 +86,7 @@ RUN apt-get update \ libsasl2-dev \ libtiff5-dev \ libwebp-dev \ + pkg-config \ redis-tools \ rlwrap \ tk8.6-dev \