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

fix images

Browse source
This commit is contained in:
Bohdan Kucherivayi 2024-02-16 18:23:19 +02:00
parent 7b7945b0bd
commit a13999b775
3 changed files with 17 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
compose.yaml
View file

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

66
docker-compose.yml
View file

@ -10,17 +10,9 @@ services:
default: null
volumes:
- type: volume
source: erp-sites
source: 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:
- |
@ -49,17 +41,9 @@ services:
default: null
volumes:
- type: volume
source: erp-sites
source: 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:
- --character-set-server=utf8mb4
@ -111,7 +95,7 @@ services:
protocol: tcp
volumes:
- type: volume
source: erp-sites
source: sites
target: /home/zapal/frappe-bench/sites
volume: {}
queue-long:
@ -129,17 +113,9 @@ services:
default: null
volumes:
- type: volume
source: erp-sites
source: 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:
- bench
@ -155,17 +131,9 @@ services:
default: null
volumes:
- type: volume
source: erp-sites
source: 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
networks:
@ -197,17 +165,9 @@ services:
default: null
volumes:
- type: volume
source: erp-sites
source: 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:
- node
@ -221,7 +181,7 @@ services:
default: null
volumes:
- type: volume
source: erp-sites
source: sites
target: /home/zapal/frappe-bench/sites
volume: {}
networks:
@ -230,25 +190,19 @@ networks:
volumes:
db-data:
name: erp_db-data
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:
name: erp_redis-queue-data
sites:
name: erp_sites
x-backend-defaults:
depends_on:
configurator:
condition: service_completed_successfully
image: zapal/erp:latest
volumes:
- erp-sites:/home/zapal/frappe-bench/sites
- erp-assets:/home/zapal/frappe-bench/sites/assets
- erp-logs:/home/zapal/frappe-bench/logs
- sites:/home/zapal/frappe-bench/sites
x-customizable-image:
image: zapal/erp:latest
x-depends-on-configurator:

6
images/production/Containerfile
View file

@ -119,9 +119,9 @@ RUN bench init \
WORKDIR /home/zapal/frappe-bench
RUN bench get-app --branch=${ERPNEXT_BRANCH} --resolve-deps erpnext ${ERPNEXT_REPO}
RUN bench get-app --branch=${HRMS_BRANCH} --resolve-deps hrms ${HRMS_REPO}
# RUN bench get-app --branch=${INSIGHTS_BRANCH} --resolve-deps insights ${INSIGHTS_REPO}
RUN cd /home/zapal/frappe-bench && bench get-app --branch=${ERPNEXT_BRANCH} --resolve-deps erpnext ${ERPNEXT_REPO}
RUN cd /home/zapal/frappe-bench && bench get-app --branch=${HRMS_BRANCH} --resolve-deps hrms ${HRMS_REPO}
# RUN cd /home/zapal/frappe-bench && bench get-app --branch=${INSIGHTS_BRANCH} --resolve-deps insights ${INSIGHTS_REPO}
RUN echo "frappe\nhrms\nerpnext" > sites/apps.txt
RUN echo "{}" > sites/common_site_config.json