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

feat: update dockerfiles

Browse source
This commit is contained in:
Bohdan Kucherivayi 2024-02-16 17:31:47 +02:00
parent 506293a16d
commit df430b7cd9
5 changed files with 95 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
COMPOSE_FILE.md Normal file
View 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
View file

@ -1,5 +1,5 @@
x-customizable-image: &customizable_image x-customizable-image: &customizable_image
image: zapal/erp:latest image: zapal-tech/erp:latest
x-depends-on-configurator: &depends_on_configurator x-depends-on-configurator: &depends_on_configurator
depends_on: depends_on:
@ -9,7 +9,9 @@ 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:
- 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: services:
configurator: configurator:
@ -52,7 +54,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:
- ./data:/home/zapal/frappe-bench - erp-sites:/home/zapal/frappe-bench/sites
depends_on: depends_on:
- backend - backend
- websocket - websocket
@ -63,7 +65,7 @@ services:
- node - node
- /home/zapal/frappe-bench/apps/frappe/socketio.js - /home/zapal/frappe-bench/apps/frappe/socketio.js
volumes: volumes:
- ./data:/home/zapal/frappe-bench - erp-sites:/home/zapal/frappe-bench/sites
queue-short: queue-short:
<<: *backend_defaults <<: *backend_defaults
@ -78,4 +80,6 @@ services:
command: bench schedule command: bench schedule
volumes: volumes:
erp-bench: erp-sites:
erp-assets:
erp-logs:

113
docker-compose.yml
View file

@ -5,13 +5,21 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: erp-bench source: erp-sites
target: /home/zapal/frappe-bench 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: {} volume: {}
configurator: configurator:
command: command:
@ -36,13 +44,21 @@ services:
REDIS_CACHE: redis-cache:6379 REDIS_CACHE: redis-cache:6379
REDIS_QUEUE: redis-queue:6379 REDIS_QUEUE: redis-queue:6379
SOCKETIO_PORT: "9000" SOCKETIO_PORT: "9000"
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: erp-bench source: erp-sites
target: /home/zapal/frappe-bench 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: {} volume: {}
db: db:
command: command:
@ -85,15 +101,19 @@ services:
UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1 UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
UPSTREAM_REAL_IP_HEADER: X-Forwarded-For UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
UPSTREAM_REAL_IP_RECURSIVE: "off" UPSTREAM_REAL_IP_RECURSIVE: "off"
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
ports:
- mode: ingress
target: 8080
published: "8080"
protocol: tcp
volumes: volumes:
- type: bind - type: volume
source: /home/bohdan-kucheriavyi/Documents/Repositories/Zapal/erp/data source: erp-sites
target: /home/zapal/frappe-bench target: /home/zapal/frappe-bench/sites
bind: volume: {}
create_host_path: true
queue-long: queue-long:
command: command:
- bench - bench
@ -104,13 +124,21 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: erp-bench source: erp-sites
target: /home/zapal/frappe-bench 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: {} volume: {}
queue-short: queue-short:
command: command:
@ -122,13 +150,21 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: erp-bench source: erp-sites
target: /home/zapal/frappe-bench 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: {} volume: {}
redis-cache: redis-cache:
image: redis:6.2-alpine image: redis:6.2-alpine
@ -156,13 +192,21 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
- type: volume - type: volume
source: erp-bench source: erp-sites
target: /home/zapal/frappe-bench 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: {} volume: {}
websocket: websocket:
command: command:
@ -172,23 +216,26 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal/erp:latest image: zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
- type: bind - type: volume
source: /home/bohdan-kucheriavyi/Documents/Repositories/Zapal/erp/data source: erp-sites
target: /home/zapal/frappe-bench target: /home/zapal/frappe-bench/sites
bind: volume: {}
create_host_path: true
networks: networks:
default: default:
name: erp_default name: erp_default
volumes: volumes:
db-data: db-data:
name: erp_db-data name: erp_db-data
erp-bench: erp-assets:
name: erp_erp-bench name: erp_erp-assets
erp-logs:
name: erp_erp-logs
erp-sites:
name: erp_erp-sites
redis-cache-data: redis-cache-data:
name: erp_redis-cache-data name: erp_redis-cache-data
redis-queue-data: redis-queue-data:
@ -197,11 +244,13 @@ x-backend-defaults:
depends_on: depends_on:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
image: zapal/erp:latest image: zapal-tech/erp:latest
volumes: 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: x-customizable-image:
image: zapal/erp:latest image: zapal-tech/erp:latest
x-depends-on-configurator: x-depends-on-configurator:
depends_on: depends_on:
configurator: 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"] VOLUME ["/home/zapal/frappe-bench/sites", "/home/zapal/frappe-bench/sites/assets", "/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"] VOLUME ["/home/zapal/frappe-bench/sites", "/home/zapal/frappe-bench/sites/assets", "/home/zapal/frappe-bench/logs"]
CMD [ \ CMD [ \
"/home/zapal/frappe-bench/env/bin/gunicorn", \ "/home/zapal/frappe-bench/env/bin/gunicorn", \