Merge pull request #10 from zapal-tech/main

fix: containers

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
+    - ./data:/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
+      - ./data:/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
+      - ./data:/home/zapal/frappe-bench
 
   queue-short:
     <<: *backend_defaults

docker-compose.yml

@@ -5,14 +5,15 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
   configurator:
     command:
       - |
@@ -36,14 +37,15 @@ services:
       REDIS_CACHE: redis-cache:6379
       REDIS_QUEUE: redis-queue:6379
       SOCKETIO_PORT: "9000"
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
   db:
     command:
       - --character-set-server=utf8mb4
@@ -85,19 +87,15 @@ services:
       UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
       UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
       UPSTREAM_REAL_IP_RECURSIVE: "off"
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
-    ports:
-      - mode: ingress
-        target: 8080
-        published: "8080"
-        protocol: tcp
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
   queue-long:
     command:
       - bench
@@ -108,14 +106,15 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
   queue-short:
     command:
       - bench
@@ -126,14 +125,15 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
   redis-cache:
     image: redis:6.2-alpine
     networks:
@@ -160,14 +160,15 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
   websocket:
     command:
       - node
@@ -176,14 +177,15 @@ services:
       configurator:
         condition: service_completed_successfully
         required: true
-    image: ghcr.io/zapal-tech/erp:latest
+    image: zapal-tech/erp:latest
     networks:
       default: null
     volumes:
-      - type: volume
+      - type: bind
-        source: sites
+        source: ./data
-        target: /home/zapal/frappe-bench/sites
+        target: /home/zapal/frappe-bench
-        volume: {}
+        bind:
+          create_host_path: true
 networks:
   default:
     name: erp_default
@@ -194,17 +196,15 @@ volumes:
     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: ghcr.io/zapal-tech/erp:latest
+  image: zapal-tech/erp:latest
   volumes:
-    - sites:/home/zapal/frappe-bench/sites
+    - ./data:/home/zapal/frappe-bench
 x-customizable-image:
-  image: ghcr.io/zapal-tech/erp:latest
+  image: 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 rm -fr
+# RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
 
 FROM base as erp
 
@@ -144,11 +144,7 @@ COPY /usr/local/bin/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
 
 WORKDIR /home/zapal/frappe-bench
 
-VOLUME [ \
+VOLUME ["/home/zapal/frappe-bench"]
-  "/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 rm -fr
+# RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
 
 FROM base as erp
 
@@ -136,11 +136,7 @@ COPY --from=builder --chown=zapal:zapal /home/zapal/frappe-bench /home/zapal/fra
 
 WORKDIR /home/zapal/frappe-bench
 
-VOLUME [ \
+VOLUME ["/home/zapal/frappe-bench"]
-  "/home/zapal/frappe-bench/sites", \
-  "/home/zapal/frappe-bench/sites/assets", \
-  "/home/zapal/frappe-bench/logs" \
-]
 
 CMD [ \
   "/home/zapal/frappe-bench/env/bin/gunicorn", \