From c013942d1f5e015f0f12ece5a6cad0160bfb9650 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Tue, 31 Jan 2023 09:48:52 +0530
Subject: [PATCH 1/2] fix: use docker volumes (#1067)

* fix: use docker volumes

remove bind mount
use docker volumes

* ci: remove payments app from tests
---
 docs/development.md                   | 2 +-
 overrides/compose.mariadb-shared.yaml | 5 ++++-
 overrides/compose.traefik-ssl.yaml    | 5 ++++-
 tests/conftest.py                     | 6 ------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/development.md b/docs/development.md
index 476314a4..19060abb 100644
--- a/docs/development.md
+++ b/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
diff --git a/overrides/compose.mariadb-shared.yaml b/overrides/compose.mariadb-shared.yaml
index 29e7404b..13bfc656 100644
--- a/overrides/compose.mariadb-shared.yaml
+++ b/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:
diff --git a/overrides/compose.traefik-ssl.yaml b/overrides/compose.traefik-ssl.yaml
index 6a31998f..0c0a9b84 100644
--- a/overrides/compose.traefik-ssl.yaml
+++ b/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:
diff --git a/tests/conftest.py b/tests/conftest.py
index 5c4e3d75..015c5e78 100644
--- a/tests/conftest.py
+++ b/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

From dd82961e4cf7367bf5993c7ac0c049b526484030 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 31 Jan 2023 06:31:42 +0000
Subject: [PATCH 2/2] chore: Update example.env

---
 example.env |  2 +-
 pwd.yml     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/example.env b/example.env
index 4236f7ed..4fc1675d 100644
--- a/example.env
+++ b/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
 
diff --git a/pwd.yml b/pwd.yml
index 898a5222..351be255 100644
--- a/pwd.yml
+++ b/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