diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 8042a94c..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: @@ -45,8 +45,11 @@ 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 @@ -95,3 +98,4 @@ jobs: uses: docker/bake-action@v6.5.0 with: push: true + set: "*.platform=linux/amd64,linux/arm64" diff --git a/example.env b/example.env index 80d6fd25..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.53.4 +ERPNEXT_VERSION=v15.54.4 DB_PASSWORD=123 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 \ diff --git a/pwd.yml b/pwd.yml index 390327c3..b12e9dbc 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.4 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.4 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.4 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.4 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.4 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.4 networks: - frappe_network deploy: @@ -178,7 +178,7 @@ services: condition: on-failure scheduler: - image: frappe/erpnext:v15.53.4 + 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.53.4 + image: frappe/erpnext:v15.54.4 networks: - frappe_network deploy: