From 725979dc05df95bd71c7053186ab9c0726c8c038 Mon Sep 17 00:00:00 2001
From: Lev Vereshchagin <mail@vrslev.com>
Date: Wed, 15 Dec 2021 09:14:44 +0300
Subject: [PATCH] Move assets volume to main compose file

---
 compose.yaml                   | 4 ++++
 overrides/compose.erpnext.yaml | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index bffbddc2..1bad8e4f 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -10,6 +10,7 @@ services:
       SOCKETIO_PORT: 9000
     volumes:
       - sites:/home/frappe/frappe-bench/sites
+      - assets:/home/frappe/frappe-bench/sites/assets
     depends_on:
       db:
         condition: service_healthy
@@ -46,6 +47,7 @@ services:
       FRAPPE_SITE_NAME_HEADER: $$host
     volumes:
       - sites:/usr/share/nginx/html/sites
+      - assets:/usr/share/nginx/html/assets
     labels:
       - traefik.enable=true
       - traefik.http.services.frontend.loadbalancer.server.port=80
@@ -103,7 +105,9 @@ services:
     depends_on:
       - backend
 
+# ERPNext requires local assets access (Frappe does not)
 volumes:
   sites:
+  assets:
   db:
   redis:
diff --git a/overrides/compose.erpnext.yaml b/overrides/compose.erpnext.yaml
index c4ec5b5d..03042a36 100644
--- a/overrides/compose.erpnext.yaml
+++ b/overrides/compose.erpnext.yaml
@@ -1,13 +1,9 @@
 services:
   backend:
     image: frappe/erpnext-worker:${ERPNEXT_VERSION}
-    volumes:
-      - assets:/home/frappe/frappe-bench/sites/assets
 
   frontend:
     image: frappe/erpnext-nginx:${ERPNEXT_VERSION}
-    volumes:
-      - assets:/usr/share/nginx/html/assets
 
   queue-short:
     image: frappe/erpnext-worker:${ERPNEXT_VERSION}
@@ -20,7 +16,3 @@ services:
 
   scheduler:
     image: frappe/erpnext-worker:${ERPNEXT_VERSION}
-
-# ERPNext requires local assets access (Frappe does not)
-volumes:
-  assets: