Merge pull request #11 from zapal-tech/main

fixes

compose.yaml

@@ -1,5 +1,5 @@
 x-customizable-image: &customizable_image
-  image: zapal-tech/erp:latest
+  image: ghcr.io/zapal-tech/erp:latest
 
 x-depends-on-configurator: &depends_on_configurator
   depends_on:
@@ -9,7 +9,9 @@ x-depends-on-configurator: &depends_on_configurator
 x-backend-defaults: &backend_defaults
   <<: [*depends_on_configurator, *customizable_image]
   volumes:
-    - ./data:/home/zapal/frappe-bench
+    - ./data/sites:/home/zapal/frappe-bench/sites
+    - ./data/sites-assets:/home/zapal/frappe-bench/sites/assets
+    - ./data/logs:/home/zapal/frappe-bench/logs
 
 services:
   configurator:

docker-compose.yml

@@ -5,13 +5,23 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
       - type: bind
-        source: ./data
-        target: /home/zapal/frappe-bench
+        source: ./data/sites
+        target: /home/zapal/frappe-bench/sites
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/sites-assets
+        target: /home/zapal/frappe-bench/sites/assets
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/logs
+        target: /home/zapal/frappe-bench/logs
         bind:
           create_host_path: true
   configurator:
@@ -37,13 +47,23 @@ services:
       REDIS_CACHE: redis-cache:6379
       REDIS_QUEUE: redis-queue:6379
       SOCKETIO_PORT: "9000"
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
       - type: bind
-        source: ./data
-        target: /home/zapal/frappe-bench
+        source: ./data/sites
+        target: /home/zapal/frappe-bench/sites
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/sites-assets
+        target: /home/zapal/frappe-bench/sites/assets
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/logs
+        target: /home/zapal/frappe-bench/logs
         bind:
           create_host_path: true
   db:
@@ -87,7 +107,7 @@ services:
       UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
       UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
       UPSTREAM_REAL_IP_RECURSIVE: "off"
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
@@ -106,13 +126,23 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
       - type: bind
-        source: ./data
-        target: /home/zapal/frappe-bench
+        source: ./data/sites
+        target: /home/zapal/frappe-bench/sites
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/sites-assets
+        target: /home/zapal/frappe-bench/sites/assets
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/logs
+        target: /home/zapal/frappe-bench/logs
         bind:
           create_host_path: true
   queue-short:
@@ -125,13 +155,23 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
       - type: bind
-        source: ./data
-        target: /home/zapal/frappe-bench
+        source: ./data/sites
+        target: /home/zapal/frappe-bench/sites
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/sites-assets
+        target: /home/zapal/frappe-bench/sites/assets
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/logs
+        target: /home/zapal/frappe-bench/logs
         bind:
           create_host_path: true
   redis-cache:
@@ -160,13 +200,23 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
       - type: bind
-        source: ./data
-        target: /home/zapal/frappe-bench
+        source: ./data/sites
+        target: /home/zapal/frappe-bench/sites
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/sites-assets
+        target: /home/zapal/frappe-bench/sites/assets
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ./data/logs
+        target: /home/zapal/frappe-bench/logs
         bind:
           create_host_path: true
   websocket:
@@ -177,7 +227,7 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: zapal-tech/erp:latest
+    image: ghcr.io/zapal-tech/erp:latest
     networks:
       default: null
     volumes:
@@ -200,11 +250,13 @@ x-backend-defaults:
   depends_on:
     configurator:
       condition: service_completed_successfully
-  image: zapal-tech/erp:latest
+  image: ghcr.io/zapal-tech/erp:latest
   volumes:
-    - ./data:/home/zapal/frappe-bench
+    - ./data/sites:/home/zapal/frappe-bench/sites
+    - ./data/sites-assets:/home/zapal/frappe-bench/sites/assets
+    - ./data/logs:/home/zapal/frappe-bench/logs
 x-customizable-image:
-  image: zapal-tech/erp:latest
+  image: ghcr.io/zapal-tech/erp:latest
 x-depends-on-configurator:
   depends_on:
     configurator:

images/custom/Containerfile

@@ -132,7 +132,7 @@ RUN bench get-app --branch=${HRMS_BRANCH} --resolve-deps hrms ${HRMS_REPO}
 RUN echo "frappe\nhrms\nerpnext" > sites/apps.txt
 RUN echo "{}" > sites/common_site_config.json
 # DO NOT REMOVE .git FOLDERS
-# RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
+RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
 
 FROM base as erp
 
@@ -144,7 +144,11 @@ COPY /usr/local/bin/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
 
 WORKDIR /home/zapal/frappe-bench
 
-VOLUME ["/home/zapal/frappe-bench"]
+VOLUME [ \
+  "/home/zapal/frappe-bench/sites", \
+  "/home/zapal/frappe-bench/sites/assets", \
+  "/home/zapal/frappe-bench/logs" \
+]
 
 CMD [ \
   "/home/zapal/frappe-bench/env/bin/gunicorn", \

images/production/Containerfile

@@ -126,7 +126,7 @@ RUN bench get-app --branch=${HRMS_BRANCH} --resolve-deps hrms ${HRMS_REPO}
 RUN echo "frappe\nhrms\nerpnext" > sites/apps.txt
 RUN echo "{}" > sites/common_site_config.json
 # DO NOT REMOVE .git FOLDERS
-# RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
+RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
 
 FROM base as erp
 
@@ -136,7 +136,11 @@ COPY --from=builder --chown=zapal:zapal /home/zapal/frappe-bench /home/zapal/fra
 
 WORKDIR /home/zapal/frappe-bench
 
-VOLUME ["/home/zapal/frappe-bench"]
+VOLUME [ \
+  "/home/zapal/frappe-bench/sites", \
+  "/home/zapal/frappe-bench/sites/assets", \
+  "/home/zapal/frappe-bench/logs" \
+]
 
 CMD [ \
   "/home/zapal/frappe-bench/env/bin/gunicorn", \