Merge branch 'frappe:main' into main

docs/development.md

@@ -204,7 +204,7 @@ bench get-app --branch version-12 https://github.com/myusername/myapp
 bench --site mysite.localhost install-app myapp
 ```
 
-At the time of this writing, the Payments app has been factored out of the Version 14 ERPNext app and is now a separate app. ERPNext will not install without it, however, so we need to specify `--resolve-deps` command line switch to install it.
+At the time of this writing, the Payments app has been factored out of the Version 14 ERPNext app and is now a separate app. ERPNext will not install it.
 
 ```shell
 bench get-app --branch version-14 --resolve-deps erpnext

example.env

@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md
 
-ERPNEXT_VERSION=v14.14.0
+ERPNEXT_VERSION=v14.15.0
 
 DB_PASSWORD=123
 

overrides/compose.mariadb-shared.yaml

@@ -17,7 +17,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit}
     volumes:
-      - ${HOME}/data/mariadb:/var/lib/mysql
+      - db-data:/var/lib/mysql
     networks:
       - mariadb-network
 
@@ -25,3 +25,6 @@ networks:
   mariadb-network:
     name: mariadb-network
     external: false
+
+volumes:
+  db-data:

overrides/compose.traefik-ssl.yaml

@@ -42,4 +42,7 @@ services:
     ports:
       - 443:443
     volumes:
-      - ${HOME}/data/traefik/certificates:/certificates
+      - cert-data:/certificates
+
+volumes:
+  cert-data:

pwd.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   backend:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -11,7 +11,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   configurator:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: none
@@ -38,7 +38,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: none
@@ -89,7 +89,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -111,7 +111,7 @@ services:
       - "8080:8080"
 
   queue-default:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -125,7 +125,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-long:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -139,7 +139,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   queue-short:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -177,7 +177,7 @@ services:
       - redis-socketio-data:/data
 
   scheduler:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure
@@ -189,7 +189,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v14.14.0
+    image: frappe/erpnext:v14.15.0
     deploy:
       restart_policy:
         condition: on-failure

tests/conftest.py

@@ -89,12 +89,6 @@ def erpnext_site(compose: Compose):
         "erpnext",
         site_name,
     ]
-    erpnext_version = os.environ.get("ERPNEXT_VERSION")
-    if erpnext_version in [
-        "develop",
-        "version-14",
-    ] or erpnext_version.startswith("v14"):
-        args.append("--install-app=payments")
     compose.bench(*args)
     compose("restart", "backend")
     yield site_name