mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-23 00:05:09 +00:00
fixes
This commit is contained in:
Bohdan Kucherivayi
parent
916b42483e
commit
ab20bf6b80
4 changed files with 78 additions and 16 deletions
|
|
@ -9,7 +9,9 @@ x-depends-on-configurator: &depends_on_configurator
|
|||
x-backend-defaults: &backend_defaults
|
||||
<<: [*depends_on_configurator, *customizable_image]
|
||||
volumes:
|
||||
- ./data:/home/zapal/frappe-bench
|
||||
- ./data/sites:/home/zapal/frappe-bench/sites
|
||||
- ./data/sites-assets:/home/zapal/frappe-bench/sites/assets
|
||||
- ./data/logs:/home/zapal/frappe-bench/logs
|
||||
|
||||
services:
|
||||
configurator:
|
||||
|
|
|
|||
|
|
@ -10,8 +10,18 @@ services:
|
|||
default: null
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./data
|
||||
target: /home/zapal/frappe-bench
|
||||
source: ./data/sites
|
||||
target: /home/zapal/frappe-bench/sites
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/sites-assets
|
||||
target: /home/zapal/frappe-bench/sites/assets
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/logs
|
||||
target: /home/zapal/frappe-bench/logs
|
||||
bind:
|
||||
create_host_path: true
|
||||
configurator:
|
||||
|
|
@ -42,8 +52,18 @@ services:
|
|||
default: null
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./data
|
||||
target: /home/zapal/frappe-bench
|
||||
source: ./data/sites
|
||||
target: /home/zapal/frappe-bench/sites
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/sites-assets
|
||||
target: /home/zapal/frappe-bench/sites/assets
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/logs
|
||||
target: /home/zapal/frappe-bench/logs
|
||||
bind:
|
||||
create_host_path: true
|
||||
db:
|
||||
|
|
@ -111,8 +131,18 @@ services:
|
|||
default: null
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./data
|
||||
target: /home/zapal/frappe-bench
|
||||
source: ./data/sites
|
||||
target: /home/zapal/frappe-bench/sites
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/sites-assets
|
||||
target: /home/zapal/frappe-bench/sites/assets
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/logs
|
||||
target: /home/zapal/frappe-bench/logs
|
||||
bind:
|
||||
create_host_path: true
|
||||
queue-short:
|
||||
|
|
@ -130,8 +160,18 @@ services:
|
|||
default: null
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./data
|
||||
target: /home/zapal/frappe-bench
|
||||
source: ./data/sites
|
||||
target: /home/zapal/frappe-bench/sites
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/sites-assets
|
||||
target: /home/zapal/frappe-bench/sites/assets
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/logs
|
||||
target: /home/zapal/frappe-bench/logs
|
||||
bind:
|
||||
create_host_path: true
|
||||
redis-cache:
|
||||
|
|
@ -165,8 +205,18 @@ services:
|
|||
default: null
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./data
|
||||
target: /home/zapal/frappe-bench
|
||||
source: ./data/sites
|
||||
target: /home/zapal/frappe-bench/sites
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/sites-assets
|
||||
target: /home/zapal/frappe-bench/sites/assets
|
||||
bind:
|
||||
create_host_path: true
|
||||
- type: bind
|
||||
source: ./data/logs
|
||||
target: /home/zapal/frappe-bench/logs
|
||||
bind:
|
||||
create_host_path: true
|
||||
websocket:
|
||||
|
|
@ -202,7 +252,9 @@ x-backend-defaults:
|
|||
condition: service_completed_successfully
|
||||
image: ghcr.io/zapal-tech/erp:latest
|
||||
volumes:
|
||||
- ./data:/home/zapal/frappe-bench
|
||||
- ./data/sites:/home/zapal/frappe-bench/sites
|
||||
- ./data/sites-assets:/home/zapal/frappe-bench/sites/assets
|
||||
- ./data/logs:/home/zapal/frappe-bench/logs
|
||||
x-customizable-image:
|
||||
image: ghcr.io/zapal-tech/erp:latest
|
||||
x-depends-on-configurator:
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ RUN bench get-app --branch=${HRMS_BRANCH} --resolve-deps hrms ${HRMS_REPO}
|
|||
RUN echo "frappe\nhrms\nerpnext" > sites/apps.txt
|
||||
RUN echo "{}" > sites/common_site_config.json
|
||||
# DO NOT REMOVE .git FOLDERS
|
||||
# RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
|
||||
RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
|
||||
|
||||
FROM base as erp
|
||||
|
||||
|
|
@ -144,7 +144,11 @@ 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", \
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ RUN bench get-app --branch=${HRMS_BRANCH} --resolve-deps hrms ${HRMS_REPO}
|
|||
RUN echo "frappe\nhrms\nerpnext" > sites/apps.txt
|
||||
RUN echo "{}" > sites/common_site_config.json
|
||||
# DO NOT REMOVE .git FOLDERS
|
||||
# RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
|
||||
RUN find apps -mindepth 1 -path "*/.git" | xargs git remote rm upstream
|
||||
|
||||
FROM base as erp
|
||||
|
||||
|
|
@ -136,7 +136,11 @@ 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