From 8e10cc1cc65ff7a6047bbf96ce70335a014f940a Mon Sep 17 00:00:00 2001
From: Bohdan Kucherivayi <bohdan.kucheriavyi@zapal.tech>
Date: Fri, 16 Feb 2024 18:44:21 +0200
Subject: [PATCH] fix

---
 compose.yaml                    |  8 ++++----
 docker-compose.yml              | 34 ++++++++++++++++-----------------
 images/custom/Containerfile     |  2 +-
 images/production/Containerfile |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 9d8c5937..fd91f9d2 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -9,7 +9,7 @@ x-depends-on-configurator: &depends_on_configurator
 x-backend-defaults: &backend_defaults
   <<: [*depends_on_configurator, *customizable_image]
   volumes:
-    - sites:/home/zapal/frappe-bench/sites
+    - erp-bench:/home/zapal/frappe-bench
 
 services:
   configurator:
@@ -52,7 +52,7 @@ services:
       PROXY_READ_TIMEOUT: ${PROXY_READ_TIMEOUT:-120}
       CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-50m}
     volumes:
-      - sites:/home/zapal/frappe-bench/sites
+      - erp-bench:/home/zapal/frappe-bench
     depends_on:
       - backend
       - websocket
@@ -63,7 +63,7 @@ services:
       - node
       - /home/zapal/frappe-bench/apps/frappe/socketio.js
     volumes:
-      - sites:/home/zapal/frappe-bench/sites
+      - erp-bench:/home/zapal/frappe-bench
 
   queue-short:
     <<: *backend_defaults
@@ -78,4 +78,4 @@ services:
     command: bench schedule
 
 volumes:
-  sites:
+  erp-bench:
diff --git a/docker-compose.yml b/docker-compose.yml
index 10a66a14..e44b74cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,8 @@ services:
       default: null
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
   configurator:
     command:
@@ -41,8 +41,8 @@ services:
       default: null
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
   db:
     command:
@@ -95,8 +95,8 @@ services:
         protocol: tcp
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
   queue-long:
     command:
@@ -113,8 +113,8 @@ services:
       default: null
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
   queue-short:
     command:
@@ -131,8 +131,8 @@ services:
       default: null
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
   redis-cache:
     image: redis:6.2-alpine
@@ -165,8 +165,8 @@ services:
       default: null
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
   websocket:
     command:
@@ -181,8 +181,8 @@ services:
       default: null
     volumes:
       - type: volume
-        source: sites
-        target: /home/zapal/frappe-bench/sites
+        source: erp-bench
+        target: /home/zapal/frappe-bench
         volume: {}
 networks:
   default:
@@ -190,19 +190,19 @@ networks:
 volumes:
   db-data:
     name: erp_db-data
+  erp-bench:
+    name: erp_erp-bench
   redis-cache-data:
     name: erp_redis-cache-data
   redis-queue-data:
     name: erp_redis-queue-data
-  sites:
-    name: erp_sites
 x-backend-defaults:
   depends_on:
     configurator:
       condition: service_completed_successfully
   image: zapal/erp:latest
   volumes:
-    - sites:/home/zapal/frappe-bench/sites
+    - erp-bench:/home/zapal/frappe-bench
 x-customizable-image:
   image: zapal/erp:latest
 x-depends-on-configurator:
diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index a01d49be..e1ed7f32 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -143,7 +143,7 @@ COPY /usr/local/bin/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
 
 WORKDIR /home/zapal/frappe-bench
 
-VOLUME ["/home/zapal/frappe-bench/sites", "/home/zapal/frappe-bench/sites/assets", "/home/zapal/frappe-bench/logs"]
+VOLUME ["/home/zapal/frappe-bench", "/home/zapal/frappe-bench/logs"]
 
 CMD [ \
   "/home/zapal/frappe-bench/env/bin/gunicorn", \
diff --git a/images/production/Containerfile b/images/production/Containerfile
index 7488b340..107b747a 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -135,7 +135,7 @@ COPY --from=builder --chown=zapal:zapal /home/zapal/frappe-bench /home/zapal/fra
 
 WORKDIR /home/zapal/frappe-bench
 
-VOLUME ["/home/zapal/frappe-bench/sites", "/home/zapal/frappe-bench/sites/assets", "/home/zapal/frappe-bench/logs"]
+VOLUME ["/home/zapal/frappe-bench", "/home/zapal/frappe-bench/logs"]
 
 CMD [ \
   "/home/zapal/frappe-bench/env/bin/gunicorn", \