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

Merge pull request #11 from zapal-tech/main

Browse source 
fixes
This commit is contained in:
Bohdan Kucheriavyi 2024-02-15 20:24:12 +02:00 committed by GitHub
commit 2fae56ccd6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 88 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
compose.yaml
View file

@ -1,5 +1,5 @@
x-customizable-image: &customizable_image x-customizable-image: &customizable_image
image: zapal-tech/erp:latest image: ghcr.io/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:
- ./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:

92
docker-compose.yml
View file

@ -5,13 +5,23 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
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:
@ -37,13 +47,23 @@ 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-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
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:
@ -87,7 +107,7 @@ 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-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -106,13 +126,23 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
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:
@ -125,13 +155,23 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
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:
@ -160,13 +200,23 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
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:
@ -177,7 +227,7 @@ services:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
required: true required: true
image: zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
networks: networks:
default: null default: null
volumes: volumes:
@ -200,11 +250,13 @@ x-backend-defaults:
depends_on: depends_on:
configurator: configurator:
condition: service_completed_successfully condition: service_completed_successfully
image: 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: zapal-tech/erp:latest image: ghcr.io/zapal-tech/erp:latest
x-depends-on-configurator: x-depends-on-configurator:
depends_on: depends_on:
configurator: 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", \