Merge branch 'frappe:main' into main

This commit is contained in:
Sudheer T 2025-04-11 14:31:29 +05:30 committed by GitHub
commit 2cdf119c94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 9 deletions

View file

@ -221,6 +221,11 @@ bench --site development.localhost install-app erpnext
``` ```
Note: Both frappe and erpnext must be on branch with same name. e.g. version-14 Note: Both frappe and erpnext must be on branch with same name. e.g. version-14
You can use the `switch-to-branch` command to align versions if you get an error about mismatching versions.
```shell
bench switch-to-branch version-xx
```
### Start Frappe without debugging ### Start Frappe without debugging

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.55.1 ERPNEXT_VERSION=v15.57.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.55.1 image: frappe/erpnext:v15.57.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.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -47,7 +47,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
create-site: create-site:
image: frappe/erpnext:v15.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -102,7 +102,7 @@ services:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
frontend: frontend:
image: frappe/erpnext:v15.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
depends_on: depends_on:
@ -128,7 +128,7 @@ services:
- "8080:8080" - "8080:8080"
queue-long: queue-long:
image: frappe/erpnext:v15.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -144,7 +144,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
queue-short: queue-short:
image: frappe/erpnext:v15.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -178,7 +178,7 @@ services:
condition: on-failure condition: on-failure
scheduler: scheduler:
image: frappe/erpnext:v15.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -192,7 +192,7 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
websocket: websocket:
image: frappe/erpnext:v15.55.1 image: frappe/erpnext:v15.57.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy: