diff --git a/COMPOSE_FILE.md b/COMPOSE_FILE.md new file mode 100644 index 00000000..b56f5988 --- /dev/null +++ b/COMPOSE_FILE.md @@ -0,0 +1,3 @@ +# docker compose -f compose.yaml -f overrides/compose.mariadb.yaml -f overrides/compose.redis.yaml -f overrides/compose.noproxy.yaml config > docker-compose.yml + +# docker compose -f docker-compose.yml up -d diff --git a/compose.yaml b/compose.yaml index b9443b9b..efa814f4 100644 --- a/compose.yaml +++ b/compose.yaml @@ -9,7 +9,9 @@ x-depends-on-configurator: &depends_on_configurator x-backend-defaults: &backend_defaults <<: [*depends_on_configurator, *customizable_image] volumes: - - erp-bench:/home/zapal/frappe-bench + - erp-sites:/home/zapal/frappe-bench/sites + - erp-assets:/home/zapal/frappe-bench/sites/assets + - erp-logs:/home/zapal/frappe-bench/logs services: configurator: @@ -52,7 +54,7 @@ services: PROXY_READ_TIMEOUT: ${PROXY_READ_TIMEOUT:-120} CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-50m} volumes: - - ./data:/home/zapal/frappe-bench + - erp-sites:/home/zapal/frappe-bench/sites depends_on: - backend - websocket @@ -63,7 +65,7 @@ services: - node - /home/zapal/frappe-bench/apps/frappe/socketio.js volumes: - - ./data:/home/zapal/frappe-bench + - erp-sites:/home/zapal/frappe-bench/sites queue-short: <<: *backend_defaults @@ -78,4 +80,6 @@ services: command: bench schedule volumes: - erp-bench: + erp-sites: + erp-assets: + erp-logs: diff --git a/docker-compose.yml b/docker-compose.yml index bced01cb..0f44672e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,16 @@ services: default: null volumes: - type: volume - source: erp-bench - target: /home/zapal/frappe-bench + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} + - type: volume + source: erp-assets + target: /home/zapal/frappe-bench/sites/assets + volume: {} + - type: volume + source: erp-logs + target: /home/zapal/frappe-bench/logs volume: {} configurator: command: @@ -41,8 +49,16 @@ services: default: null volumes: - type: volume - source: erp-bench - target: /home/zapal/frappe-bench + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} + - type: volume + source: erp-assets + target: /home/zapal/frappe-bench/sites/assets + volume: {} + - type: volume + source: erp-logs + target: /home/zapal/frappe-bench/logs volume: {} db: command: @@ -88,12 +104,16 @@ services: image: zapal/erp:latest networks: default: null + ports: + - mode: ingress + target: 8080 + published: "8080" + protocol: tcp volumes: - - type: bind - source: /home/bohdan-kucheriavyi/Documents/Repositories/Zapal/erp/data - target: /home/zapal/frappe-bench - bind: - create_host_path: true + - type: volume + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} queue-long: command: - bench @@ -109,8 +129,16 @@ services: default: null volumes: - type: volume - source: erp-bench - target: /home/zapal/frappe-bench + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} + - type: volume + source: erp-assets + target: /home/zapal/frappe-bench/sites/assets + volume: {} + - type: volume + source: erp-logs + target: /home/zapal/frappe-bench/logs volume: {} queue-short: command: @@ -127,8 +155,16 @@ services: default: null volumes: - type: volume - source: erp-bench - target: /home/zapal/frappe-bench + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} + - type: volume + source: erp-assets + target: /home/zapal/frappe-bench/sites/assets + volume: {} + - type: volume + source: erp-logs + target: /home/zapal/frappe-bench/logs volume: {} redis-cache: image: redis:6.2-alpine @@ -161,8 +197,16 @@ services: default: null volumes: - type: volume - source: erp-bench - target: /home/zapal/frappe-bench + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} + - type: volume + source: erp-assets + target: /home/zapal/frappe-bench/sites/assets + volume: {} + - type: volume + source: erp-logs + target: /home/zapal/frappe-bench/logs volume: {} websocket: command: @@ -176,19 +220,22 @@ services: networks: default: null volumes: - - type: bind - source: /home/bohdan-kucheriavyi/Documents/Repositories/Zapal/erp/data - target: /home/zapal/frappe-bench - bind: - create_host_path: true + - type: volume + source: erp-sites + target: /home/zapal/frappe-bench/sites + volume: {} networks: default: name: erp_default volumes: db-data: name: erp_db-data - erp-bench: - name: erp_erp-bench + erp-assets: + name: erp_erp-assets + erp-logs: + name: erp_erp-logs + erp-sites: + name: erp_erp-sites redis-cache-data: name: erp_redis-cache-data redis-queue-data: @@ -199,7 +246,9 @@ x-backend-defaults: condition: service_completed_successfully image: zapal/erp:latest volumes: - - erp-bench:/home/zapal/frappe-bench + - erp-sites:/home/zapal/frappe-bench/sites + - erp-assets:/home/zapal/frappe-bench/sites/assets + - erp-logs:/home/zapal/frappe-bench/logs x-customizable-image: image: zapal/erp:latest x-depends-on-configurator: diff --git a/images/custom/Containerfile b/images/custom/Containerfile index 5ac3cd51..a01d49be 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"] +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", \ diff --git a/images/production/Containerfile b/images/production/Containerfile index 4896ba8b..e1190457 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"] +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", \