mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-23 08:15:09 +00:00
feat: update dockerfiles
This commit is contained in:
parent
506293a16d
commit
df430b7cd9
5 changed files with 95 additions and 39 deletions
3
COMPOSE_FILE.md
Normal file
3
COMPOSE_FILE.md
Normal file
|
|
@ -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
|
||||
14
compose.yaml
14
compose.yaml
|
|
@ -1,5 +1,5 @@
|
|||
x-customizable-image: &customizable_image
|
||||
image: zapal/erp:latest
|
||||
image: 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:
|
||||
- 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:
|
||||
|
|
|
|||
|
|
@ -5,13 +5,21 @@ services:
|
|||
configurator:
|
||||
condition: service_completed_successfully
|
||||
required: true
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/erp:latest
|
||||
networks:
|
||||
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:
|
||||
|
|
@ -36,13 +44,21 @@ services:
|
|||
REDIS_CACHE: redis-cache:6379
|
||||
REDIS_QUEUE: redis-queue:6379
|
||||
SOCKETIO_PORT: "9000"
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/erp:latest
|
||||
networks:
|
||||
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:
|
||||
|
|
@ -85,15 +101,19 @@ services:
|
|||
UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
|
||||
UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
|
||||
UPSTREAM_REAL_IP_RECURSIVE: "off"
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/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
|
||||
|
|
@ -104,13 +124,21 @@ services:
|
|||
configurator:
|
||||
condition: service_completed_successfully
|
||||
required: true
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/erp:latest
|
||||
networks:
|
||||
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:
|
||||
|
|
@ -122,13 +150,21 @@ services:
|
|||
configurator:
|
||||
condition: service_completed_successfully
|
||||
required: true
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/erp:latest
|
||||
networks:
|
||||
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
|
||||
|
|
@ -156,13 +192,21 @@ services:
|
|||
configurator:
|
||||
condition: service_completed_successfully
|
||||
required: true
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/erp:latest
|
||||
networks:
|
||||
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:
|
||||
|
|
@ -172,23 +216,26 @@ services:
|
|||
configurator:
|
||||
condition: service_completed_successfully
|
||||
required: true
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/erp:latest
|
||||
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:
|
||||
|
|
@ -197,11 +244,13 @@ x-backend-defaults:
|
|||
depends_on:
|
||||
configurator:
|
||||
condition: service_completed_successfully
|
||||
image: zapal/erp:latest
|
||||
image: zapal-tech/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
|
||||
image: zapal-tech/erp:latest
|
||||
x-depends-on-configurator:
|
||||
depends_on:
|
||||
configurator:
|
||||
|
|
|
|||
|
|
@ -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", \
|
||||
|
|
|
|||
|
|
@ -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", \
|
||||
|
|
|
|||
Loading…
Reference in a new issue