Merge branch 'frappe:main' into main

This commit is contained in:
Eric Libay 2025-09-04 16:32:04 +08:00 committed by GitHub
commit de019f7fb2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 19 additions and 19 deletions

View file

@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Setup QEMU - name: Setup QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
@ -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" 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 - name: Build and test
uses: docker/bake-action@v6.8.0 uses: docker/bake-action@v6.9.0
with: with:
source: . source: .
targets: bench-test targets: bench-test
@ -52,7 +52,7 @@ jobs:
- name: Push - name: Push
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
uses: docker/bake-action@v6.8.0 uses: docker/bake-action@v6.9.0
with: with:
targets: bench targets: bench
push: true push: true

View file

@ -62,7 +62,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v5 uses: actions/setup-python@v5

View file

@ -43,7 +43,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Setup QEMU - name: Setup QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
@ -66,7 +66,7 @@ jobs:
echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV"
- name: Build - name: Build
uses: docker/bake-action@v6.8.0 uses: docker/bake-action@v6.9.0
with: with:
source: . source: .
push: true push: true
@ -95,7 +95,7 @@ jobs:
- name: Push - name: Push
if: ${{ inputs.push }} if: ${{ inputs.push }}
uses: docker/bake-action@v6.8.0 uses: docker/bake-action@v6.9.0
with: with:
push: true push: true
set: "*.platform=linux/amd64,linux/arm64" set: "*.platform=linux/amd64,linux/arm64"

View file

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v5 uses: actions/setup-python@v5

View file

@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Update pre-commit hooks - name: Update pre-commit hooks
uses: vrslev/pre-commit-autoupdate@v1.0.0 uses: vrslev/pre-commit-autoupdate@v1.0.0

View file

@ -30,7 +30,7 @@ Then run: `docker compose -f pwd.yml up -d`
### To run on ARM64 architecture follow this instructions ### To run on ARM64 architecture follow this instructions
After cloning the repo run this command to build multi-architecture images specifically for ARM64. After you clone the repo and `cd frappe_docker`, 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"`

View file

@ -1,6 +1,6 @@
# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/environment-variables.md
ERPNEXT_VERSION=v15.77.0 ERPNEXT_VERSION=v15.78.0
DB_PASSWORD=123 DB_PASSWORD=123

16
pwd.yml
View file

@ -2,7 +2,7 @@ version: "3"
services: services:
backend: backend:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -18,7 +18,7 @@ services:
MARIADB_ROOT_PASSWORD: admin MARIADB_ROOT_PASSWORD: admin
configurator: configurator:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -51,7 +51,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
create-site: create-site:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -106,7 +106,7 @@ services:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
frontend: frontend:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
depends_on: depends_on:
@ -132,7 +132,7 @@ services:
- "8081:8080" - "8081:8080"
queue-long: queue-long:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -148,7 +148,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
queue-short: queue-short:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -182,7 +182,7 @@ services:
condition: on-failure condition: on-failure
scheduler: scheduler:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -196,7 +196,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
websocket: websocket:
image: frappe/erpnext:v15.77.0 image: frappe/erpnext:v15.78.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy: