epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-23 00:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #17 from zapal-tech/main

Browse source 
fix
This commit is contained in:
Bohdan Kucheriavyi 2024-02-16 18:44:48 +02:00 committed by GitHub
commit 669138abf1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
compose.yaml
View file

@ -9,7 +9,7 @@ x-depends-on-configurator: &depends_on_configurator
x-backend-defaults: &backend_defaults x-backend-defaults: &backend_defaults
<<: [*depends_on_configurator, *customizable_image] <<: [*depends_on_configurator, *customizable_image]
volumes: volumes:
- sites:/home/zapal/frappe-bench/sites - erp-bench:/home/zapal/frappe-bench
services: services:
configurator: configurator:
@ -52,7 +52,7 @@ services:
PROXY_READ_TIMEOUT: ${PROXY_READ_TIMEOUT:-120} PROXY_READ_TIMEOUT: ${PROXY_READ_TIMEOUT:-120}
CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-50m} CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-50m}
volumes: volumes:
- sites:/home/zapal/frappe-bench/sites - erp-bench:/home/zapal/frappe-bench
depends_on: depends_on:
- backend - backend
- websocket - websocket
@ -63,7 +63,7 @@ services:
- node - node
- /home/zapal/frappe-bench/apps/frappe/socketio.js - /home/zapal/frappe-bench/apps/frappe/socketio.js
volumes: volumes:
- sites:/home/zapal/frappe-bench/sites - erp-bench:/home/zapal/frappe-bench
queue-short: queue-short:
<<: *backend_defaults <<: *backend_defaults
@ -78,4 +78,4 @@ services:
command: bench schedule command: bench schedule
volumes: volumes:
sites: erp-bench:

34
docker-compose.yml
View file

@ -10,8 +10,8 @@ services:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
configurator: configurator:
command: command:
@ -41,8 +41,8 @@ services:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
db: db:
command: command:
@ -95,8 +95,8 @@ services:
protocol: tcp protocol: tcp
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
queue-long: queue-long:
command: command:
@ -113,8 +113,8 @@ services:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
queue-short: queue-short:
command: command:
@ -131,8 +131,8 @@ services:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
redis-cache: redis-cache:
image: redis:6.2-alpine image: redis:6.2-alpine
@ -165,8 +165,8 @@ services:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
websocket: websocket:
command: command:
@ -181,8 +181,8 @@ services:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: sites source: erp-bench
target: /home/zapal/frappe-bench/sites target: /home/zapal/frappe-bench
volume: {} volume: {}
networks: networks:
default: default:
@ -190,19 +190,19 @@ networks:
volumes: volumes:
db-data: db-data:
name: erp_db-data name: erp_db-data
erp-bench:
name: erp_erp-bench
redis-cache-data: redis-cache-data:
name: erp_redis-cache-data name: erp_redis-cache-data
redis-queue-data: redis-queue-data:
name: erp_redis-queue-data name: erp_redis-queue-data
sites:
name: erp_sites
x-backend-defaults: x-backend-defaults:
depends_on: depends_on:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
image: zapal/erp:latest image: zapal/erp:latest
volumes: volumes:
- sites:/home/zapal/frappe-bench/sites - erp-bench:/home/zapal/frappe-bench
x-customizable-image: x-customizable-image:
image: zapal/erp:latest image: zapal/erp:latest
x-depends-on-configurator: x-depends-on-configurator:

2
images/custom/Containerfile
View file

@ -143,7 +143,7 @@ COPY /usr/local/bin/nginx-entrypoint.sh /usr/local/bin/nginx-entrypoint.sh
WORKDIR /home/zapal/frappe-bench 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 [ \ CMD [ \
"/home/zapal/frappe-bench/env/bin/gunicorn", \ "/home/zapal/frappe-bench/env/bin/gunicorn", \

2
images/production/Containerfile
View file

@ -135,7 +135,7 @@ COPY --from=builder --chown=zapal:zapal /home/zapal/frappe-bench /home/zapal/fra
WORKDIR /home/zapal/frappe-bench 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 [ \ CMD [ \
"/home/zapal/frappe-bench/env/bin/gunicorn", \ "/home/zapal/frappe-bench/env/bin/gunicorn", \