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

fixes

Browse source
This commit is contained in:
Bohdan Kucherivayi 2024-02-15 20:20:26 +02:00
parent 916b42483e
commit ab20bf6b80
4 changed files with 78 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compose.yaml
View file

@ -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:
- ./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: services:
configurator: configurator:

74
docker-compose.yml
View file

@ -10,8 +10,18 @@ services:
default: null default: null
volumes: volumes:
- type: bind - type: bind
source: ./data source: ./data/sites
target: /home/zapal/frappe-bench 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: bind:
create_host_path: true create_host_path: true
configurator: configurator:
@ -42,8 +52,18 @@ services:
default: null default: null
volumes: volumes:
- type: bind - type: bind
source: ./data source: ./data/sites
target: /home/zapal/frappe-bench 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: bind:
create_host_path: true create_host_path: true
db: db:
@ -111,8 +131,18 @@ services:
default: null default: null
volumes: volumes:
- type: bind - type: bind
source: ./data source: ./data/sites
target: /home/zapal/frappe-bench 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: bind:
create_host_path: true create_host_path: true
queue-short: queue-short:
@ -130,8 +160,18 @@ services:
default: null default: null
volumes: volumes:
- type: bind - type: bind
source: ./data source: ./data/sites
target: /home/zapal/frappe-bench 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: bind:
create_host_path: true create_host_path: true
redis-cache: redis-cache:
@ -165,8 +205,18 @@ services:
default: null default: null
volumes: volumes:
- type: bind - type: bind
source: ./data source: ./data/sites
target: /home/zapal/frappe-bench 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: bind:
create_host_path: true create_host_path: true
websocket: websocket:
@ -202,7 +252,9 @@ x-backend-defaults:
condition: service_completed_successfully condition: service_completed_successfully
image: ghcr.io/zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
volumes: 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: x-customizable-image:
image: ghcr.io/zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
x-depends-on-configurator: x-depends-on-configurator:

8
images/custom/Containerfile
View file

@ -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 "frappe\nhrms\nerpnext" > sites/apps.txt
RUN echo "{}" > sites/common_site_config.json RUN echo "{}" > sites/common_site_config.json
# DO NOT REMOVE .git FOLDERS # 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 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 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", \

8
images/production/Containerfile
View file

@ -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 "frappe\nhrms\nerpnext" > sites/apps.txt
RUN echo "{}" > sites/common_site_config.json RUN echo "{}" > sites/common_site_config.json
# DO NOT REMOVE .git FOLDERS # 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 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 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", \