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

docs: fix lint errors

Browse source
This commit is contained in:
Revant Nandgaonkar 2022-12-28 21:19:04 +05:30
parent 081ce7eedc
commit 4e96a16ee2
2 changed files with 63 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
docs/migrate-from-multi-image-setup.md
View file

@ -14,15 +14,15 @@ Example change:
```yaml ```yaml
# ... removed for brevity # ... removed for brevity
frontend: frontend:
image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set} image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
command: command:
- nginx-entrypoint.sh - nginx-entrypoint.sh
environment: environment:
BACKEND: backend:8000 BACKEND: backend:8000
SOCKETIO: websocket:9000 SOCKETIO: websocket:9000
volumes: volumes:
- sites:/home/frappe/frappe-bench/sites - sites:/home/frappe/frappe-bench/sites
# ... removed for brevity # ... removed for brevity
``` ```
@ -34,11 +34,11 @@ Example change:
```yaml ```yaml
# ... removed for brevity # ... removed for brevity
websocket: websocket:
image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set} image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
command: command:
- node - node
- /home/frappe/frappe-bench/apps/frappe/socketio.js - /home/frappe/frappe-bench/apps/frappe/socketio.js
# ... removed for brevity # ... removed for brevity
``` ```
@ -50,27 +50,27 @@ Example change:
```yaml ```yaml
# ... removed for brevity # ... removed for brevity
configurator: configurator:
image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set} image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
restart: "no" restart: "no"
entrypoint: entrypoint:
- bash - bash
- -c - -c
command: command:
- > - >
bench set-config -g db_host $$DB_HOST; bench set-config -g db_host $$DB_HOST;
bench set-config -gp db_port $$DB_PORT; bench set-config -gp db_port $$DB_PORT;
bench set-config -g redis_cache "redis://$$REDIS_CACHE"; bench set-config -g redis_cache "redis://$$REDIS_CACHE";
bench set-config -g redis_queue "redis://$$REDIS_QUEUE"; bench set-config -g redis_queue "redis://$$REDIS_QUEUE";
bench set-config -g redis_socketio "redis://$$REDIS_SOCKETIO"; bench set-config -g redis_socketio "redis://$$REDIS_SOCKETIO";
bench set-config -gp socketio_port $$SOCKETIO_PORT; bench set-config -gp socketio_port $$SOCKETIO_PORT;
environment: environment:
DB_HOST: db DB_HOST: db
DB_PORT: "3306" DB_PORT: "3306"
REDIS_CACHE: redis-cache:6379 REDIS_CACHE: redis-cache:6379
REDIS_QUEUE: redis-queue:6379 REDIS_QUEUE: redis-queue:6379
REDIS_SOCKETIO: redis-socketio:6379 REDIS_SOCKETIO: redis-socketio:6379
SOCKETIO_PORT: "9000" SOCKETIO_PORT: "9000"
# ... removed for brevity # ... removed for brevity
``` ```
@ -84,31 +84,32 @@ Example change:
```yaml ```yaml
# ... removed for brevity # ... removed for brevity
create-site: create-site:
image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set} image: frappe/erpnext:${ERPNEXT_VERSION:?ERPNext version not set}
restart: "no" restart: "no"
entrypoint: entrypoint:
- bash - bash
- -c - -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;
wait-for-it -t 120 redis-socketio:6379; wait-for-it -t 120 redis-socketio:6379;
export start=`date +%s`; export start=`date +%s`;
until [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".db_host // empty"` ]] && \ 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_cache // empty"` ]] && \
[[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]]; [[ -n `grep -hs ^ sites/common_site_config.json | jq -r ".redis_queue // empty"` ]];
do do
echo "Waiting for sites/common_site_config.json to be created"; echo "Waiting for sites/common_site_config.json to be created";
sleep 5; sleep 5;
if (( `date +%s`-start > 120 )); then if (( `date +%s`-start > 120 )); then
echo "could not find sites/common_site_config.json with required keys"; echo "could not find sites/common_site_config.json with required keys";
exit 1 exit 1
fi fi
done; done;
echo "sites/common_site_config.json found"; echo "sites/common_site_config.json found";
bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default; bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password=admin --install-app payments --install-app erpnext --set-default;
# ... removed for brevity # ... removed for brevity
``` ```