epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-20 23:05:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fixing

Browse source
This commit is contained in:
nastiar13 2025-08-21 19:27:10 +07:00
parent 71922ca736
commit 9e9300dc2c
1 changed files with 48 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
pwd.yml
View file

@ -1,4 +1,4 @@
version: "3" version: "3.8"
services: services:
traefik: traefik:
@ -18,7 +18,7 @@ services:
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "8081:8080" # optional: dashboard access - "8081:8080" # Dashboard access
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
- traefik-letsencrypt:/letsencrypt - traefik-letsencrypt:/letsencrypt
@ -27,14 +27,12 @@ services:
restart: unless-stopped restart: unless-stopped
backend: backend:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0 # Using a more specific version
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
# extra_hosts:
# - "erp-sb1.mitrabisnisdigital.com:host-gateway"
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
@ -45,7 +43,7 @@ services:
MARIADB_ROOT_PASSWORD: admin MARIADB_ROOT_PASSWORD: admin
configurator: configurator:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
@ -74,60 +72,49 @@ services:
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
create-site-1: create-site-1:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
restart_policy: restart_policy:
condition: none condition: none
depends_on:
configurator:
condition: service_completed_successfully
db:
condition: service_healthy
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
entrypoint: entrypoint: ["/bin/bash", "-c"]
- bash
- -c
command: command:
- > - >
wait-for-it -t 120 db:3306; wait-for-it -t 120 db:3306;
wait-for-it -t 120 redis-cache:6379; wait-for-it -t 120 redis-cache:6379;
wait-for-it -t 120 redis-queue:6379; wait-for-it -t 120 redis-queue:6379;
export start=`date +%s`; bench new-site --no-mariadb-socket --mariadb-root-username=root --mariadb-root-password=admin --install-app erpnext --admin-password=admin --set-default erp-sb1.mitrabisnisdigital.com;
until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \ bench --site erp-sb1.mitrabisnisdigital.com set-config host_name https://erp-sb1.mitrabisnisdigital.com;
[[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_cache // empty"` ]] && \
[[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]];
do
echo "Waiting for sites/common_site_config.json to be created";
sleep 5;
if (( `date +%s`-start > 120 )); then
echo "could not find sites/common_site_config.json with required keys";
exit 1
fi
done;
echo "sites/common_site_config.json found";
bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-username=root --db-root-password=admin --install-app erpnext --set-default erp-sb1.mitrabisnisdigital.com;
**bench --site erp-sb1.mitrabisnisdigital.com set-config host_name http://erp-sb1.mitrabisnisdigital.com;**
create-site-2: create-site-2:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
depends_on:
- configurator
deploy: deploy:
restart_policy: restart_policy:
condition: none condition: none
depends_on:
create-site-1:
condition: service_completed_successfully # FIX: Ensure this runs AFTER site 1 is created
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
entrypoint: entrypoint: ["/bin/bash", "-c"]
- bash
- -c
command: > command: >
wait-for-it -t 120 db:3306; wait-for-it -t 120 db:3306;
wait-for-it -t 120 redis-cache:6379; wait-for-it -t 120 redis-cache:6379;
wait-for-it -t 120 redis-queue:6379; wait-for-it -t 120 redis-queue:6379;
bench new-site --mariadb-user-host-login-scope='%' --admin-password=admin --db-root-username=root --db-root-password=admin --install-app erpnext --set-default erp-sb2.mitrabisnisdigital.com; bench new-site --no-mariadb-socket --mariadb-root-username=root --mariadb-root-password=admin --install-app erpnext --admin-password=admin erp-sb2.mitrabisnisdigital.com;
bench --site erp-sb2.mitrabisnisdigital.com set-config host_name http://erp-sb2.mitrabisnisdigital.com; bench --site erp-sb2.mitrabisnisdigital.com set-config host_name https://erp-sb2.mitrabisnisdigital.com;
db: db:
image: mariadb:10.6 image: mariadb:10.6
@ -144,7 +131,7 @@ services:
- --character-set-server=utf8mb4 - --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci - --collation-server=utf8mb4_unicode_ci
- --skip-character-set-client-handshake - --skip-character-set-client-handshake
- --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 - --skip-innodb-read-only-compressed
environment: environment:
MYSQL_ROOT_PASSWORD: admin MYSQL_ROOT_PASSWORD: admin
MARIADB_ROOT_PASSWORD: admin MARIADB_ROOT_PASSWORD: admin
@ -152,11 +139,12 @@ services:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
frontend: frontend:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
depends_on: depends_on:
- websocket - websocket
- backend
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -173,50 +161,35 @@ services:
CLIENT_MAX_BODY_SIZE: 50m CLIENT_MAX_BODY_SIZE: 50m
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
# Labels for the first site # FIX: Define one service for the frontend container
- "traefik.http.services.erpnext-frontend.loadbalancer.server.port=8080"
# FIX: Router for the first site
- "traefik.http.routers.erp-sb1.rule=Host(`erp-sb1.mitrabisnisdigital.com`)" - "traefik.http.routers.erp-sb1.rule=Host(`erp-sb1.mitrabisnisdigital.com`)"
- "traefik.http.routers.erp-sb1.entrypoints=websecure" - "traefik.http.routers.erp-sb1.entrypoints=websecure"
- "traefik.http.routers.erp-sb1.tls.certresolver=myresolver" - "traefik.http.routers.erp-sb1.tls.certresolver=myresolver"
- "traefik.http.services.erp-sb1.loadbalancer.server.port=8080" - "traefik.http.routers.erp-sb1.service=erpnext-frontend"
# Labels for the second site
- "traefik.http.routers.erp-2.rule=Host(`erp-sb2.mitrabisnisdigital.com`)" # FIX: Router for the second site
- "traefik.http.routers.erp-2.entrypoints=websecure" - "traefik.http.routers.erp-sb2.rule=Host(`erp-sb2.mitrabisnisdigital.com`)"
- "traefik.http.routers.erp-2.tls.certresolver=myresolver" - "traefik.http.routers.erp-sb2.entrypoints=websecure"
- "traefik.http.services.erp-2.loadbalancer.server.port=8080" - "traefik.http.routers.erp-sb2.tls.certresolver=myresolver"
- "traefik.http.routers.erp-sb2.service=erpnext-frontend"
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
ports: # FIX: Removed redundant exposed port
- "8080:8080"
# ... (queue-long, queue-short, redis-*, scheduler, websocket services remain the same) ...
queue-long: queue-long:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
command: command: ["bench", "worker", "--queue", "long,default,short"]
- bench
- worker
- --queue
- long,default,short
volumes:
- sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs
queue-short:
image: frappe/erpnext:v15.74.0
networks:
- frappe_network
deploy:
restart_policy:
condition: on-failure
command:
- bench
- worker
- --queue
- short,default
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
@ -238,31 +211,29 @@ services:
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
volumes:
- redis-cache-data:/data
scheduler: scheduler:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
command: command: ["bench", "schedule"]
- bench
- schedule
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
websocket: websocket:
image: frappe/erpnext:v15.74.0 image: frappe/erpnext:v15.7.0
networks: networks:
- frappe_network - frappe_network
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
command: command: ["node", "/home/frappe/frappe-bench/apps/frappe/socketio.js"]
- node
- /home/frappe/frappe-bench/apps/frappe/socketio.js
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs - logs:/home/frappe/frappe-bench/logs
@ -270,6 +241,7 @@ services:
volumes: volumes:
db-data: db-data:
redis-queue-data: redis-queue-data:
redis-cache-data:
sites: sites:
logs: logs:
traefik-letsencrypt: traefik-letsencrypt: