Merge branch 'frappe:main' into fix/docker-build-cache-apps-json

This commit is contained in:
jslocomotor 2026-04-25 15:41:12 +02:00 committed by GitHub
commit 84e0608209
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 10 deletions

View file

@ -7,6 +7,6 @@ jobs:
delegate:
uses: ./.github/workflows/core-build-stable.yml
permissions:
contents: read
contents: write
packages: write
secrets: inherit

View file

@ -89,6 +89,8 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
needs: v16_publish
permissions:
contents: write
steps:
- name: Checkout

View file

@ -1,6 +1,6 @@
# Reference: https://github.com/frappe/frappe_docker/blob/main/docs/02-setup/04-env-variables.md
ERPNEXT_VERSION=v16.15.0
ERPNEXT_VERSION=v16.15.1
DB_PASSWORD=123

16
pwd.yml
View file

@ -1,6 +1,6 @@
services:
backend:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy:
@ -16,7 +16,7 @@ services:
MARIADB_ROOT_PASSWORD: admin
configurator:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy:
@ -45,7 +45,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
create-site:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy:
@ -101,7 +101,7 @@ services:
- db-data:/var/lib/mysql
frontend:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
depends_on:
@ -127,7 +127,7 @@ services:
- "8080:8080"
queue-long:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy:
@ -146,7 +146,7 @@ services:
FRAPPE_REDIS_QUEUE: redis://redis-queue:6379
queue-short:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy:
@ -183,7 +183,7 @@ services:
condition: on-failure
scheduler:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy:
@ -197,7 +197,7 @@ services:
- logs:/home/frappe/frappe-bench/logs
websocket:
image: frappe/erpnext:v16.15.0
image: frappe/erpnext:v16.15.1
networks:
- frappe_network
deploy: