epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-19 14:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix

Browse source
This commit is contained in:
nastiar13 2025-08-21 20:14:07 +07:00
parent 4c4420be53
commit 47ba72924e
1 changed files with 8 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
pwd.yml
View file

@ -35,7 +35,6 @@ services:
condition: on-failure
extra_hosts:
- "erp-sb1.mitrabisnisdigital.com:host-gateway"
- "erp-sb2.mitrabisnisdigital.com:host-gateway"
volumes:
- sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs
@ -105,42 +104,8 @@ services:
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:
image: frappe/erpnext:v15.74.0
networks:
- frappe_network
deploy:
restart_policy:
condition: none
volumes:
- sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs
entrypoint:
- bash
- -c
command:
- >
wait-for-it -t 120 db:3306;
wait-for-it -t 120 redis-cache:6379;
wait-for-it -t 120 redis-queue:6379;
export start=`date +%s`;
until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \
[[ -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 erp-sb2.mitrabisnisdigital.com;
bench --site erp-sb2.mitrabisnisdigital.com set-config host_name http://erp-sb2.mitrabisnisdigital.com;
# 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;
db:
image: mariadb:10.6
@ -177,7 +142,7 @@ services:
- nginx-entrypoint.sh
environment:
BACKEND: backend:8000
FRAPPE_SITE_NAME_HEADER: X-Frappe-Site-Name
FRAPPE_SITE_NAME_HEADER: Host
SOCKETIO: websocket:9000
UPSTREAM_REAL_IP_ADDRESS: 127.0.0.1
UPSTREAM_REAL_IP_HEADER: X-Forwarded-For
@ -186,20 +151,15 @@ services:
CLIENT_MAX_BODY_SIZE: 50m
labels:
- "traefik.enable=true"
- "traefik.http.routers.erp.rule=Host(`erp-sb1.mitrabisnisdigital.com`)"
- "traefik.http.routers.erp.rule=HostRegexp(`{subdomain:[a-z0-9-]+}.mitrabisnisdigital.com`)"
- "traefik.http.routers.erp.entrypoints=websecure"
- "traefik.http.routers.erp.tls.certresolver=myresolver"
- "traefik.http.services.erp.loadbalancer.server.port=80"
- "traefik.http.routers.erp2.rule=Host(`erp-sb2.mitrabisnisdigital.com`)"
- "traefik.http.routers.erp2.entrypoints=websecure"
- "traefik.http.routers.erp2.tls.certresolver=myresolver"
- "traefik.http.services.erp2.loadbalancer.server.port=80"
- "traefik.http.services.erp.loadbalancer.server.port=8080"
volumes:
- sites:/home/frappe/frappe-bench/sites
- logs:/home/frappe/frappe-bench/logs
# ports:
# - "8080:8080"
ports:
- "8080:8080"
queue-long:
image: frappe/erpnext:v15.74.0
@ -288,4 +248,4 @@ volumes:
networks:
frappe_network:
driver: bridge
driver: bridge