accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-02-03 12:38:29 +00:00
Code Issues Releases Activity

fix: config generation

Browse Source 
fix envsubst single quote SHELL-FORMAT
env var changed from ERPNEXT_PY to FRAPPE_PY
This commit is contained in:
Revant Nandgaonkar 2020-02-20 21:48:51 +05:30
parent 242708df0c
commit 9b6a641f4d
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/common/nginx-default.conf.template
View File

@ -1,5 +1,5 @@
upstream erpnext-server { upstream frappe-server {
server ${ERPNEXT_PY}:${ERPNEXT_PY_PORT} fail_timeout=0; server ${FRAPPE_PY}:${FRAPPE_PY_PORT} fail_timeout=0;
} }
upstream socketio-server { upstream socketio-server {
@ -44,7 +44,7 @@ server {
proxy_read_timeout 120; proxy_read_timeout 120;
proxy_redirect off; proxy_redirect off;
proxy_pass http://erpnext-server; proxy_pass http://frappe-server;
} }
# error pages # error pages

4
build/common/worker/docker-entrypoint.sh
View File

@ -28,11 +28,11 @@ function configureEnv() {
exit 1 exit 1
fi fi
envsubst "${MARIADB_HOST} envsubst '${MARIADB_HOST}
${REDIS_CACHE} ${REDIS_CACHE}
${REDIS_QUEUE} ${REDIS_QUEUE}
${REDIS_SOCKETIO} ${REDIS_SOCKETIO}
${SOCKETIO_PORT}" < /opt/frappe/common_site_config.json.template > /home/frappe/frappe-bench/sites/common_site_config.json ${SOCKETIO_PORT}' < /opt/frappe/common_site_config.json.template > /home/frappe/frappe-bench/sites/common_site_config.json
fi fi
} }

15
build/erpnext-assets/docker-entrypoint.sh
View File

@ -13,12 +13,12 @@ rsync -a --delete /var/www/html/assets/erpnext /assets
chmod -R 755 /assets chmod -R 755 /assets
if [[ -z "$ERPNEXT_PY" ]]; then if [[ -z "$FRAPPE_PY" ]]; then
export ERPNEXT_PY=0.0.0.0 export FRAPPE_PY=0.0.0.0
fi fi
if [[ -z "$ERPNEXT_PY_PORT" ]]; then if [[ -z "$FRAPPE_PY_PORT" ]]; then
export ERPNEXT_PY_PORT=8000 export FRAPPE_PY_PORT=8000
fi fi
if [[ -z "$FRAPPE_SOCKETIO" ]]; then if [[ -z "$FRAPPE_SOCKETIO" ]]; then
@ -29,7 +29,12 @@ if [[ -z "$FRAPPE_SOCKETIO_PORT" ]]; then
export FRAPPE_SOCKETIO_PORT=9000 export FRAPPE_SOCKETIO_PORT=9000
fi fi
envsubst "${API_HOST} ${API_PORT} ${ERPNEXT_PY} ${ERPNEXT_PY_PORT} ${FRAPPE_SOCKETIO} ${FRAPPE_SOCKETIO_PORT}" \ envsubst '${API_HOST}
${API_PORT}
${FRAPPE_PY}
${FRAPPE_PY_PORT}
${FRAPPE_SOCKETIO}
${FRAPPE_SOCKETIO_PORT}' \
< /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
exec "$@" exec "$@"

8
build/frappe-assets/docker-entrypoint.sh
View File

@ -9,7 +9,6 @@ set -e
rsync -a --delete /var/www/html/assets/js /assets rsync -a --delete /var/www/html/assets/js /assets
rsync -a --delete /var/www/html/assets/css /assets rsync -a --delete /var/www/html/assets/css /assets
rsync -a --delete /var/www/html/assets/frappe /assets rsync -a --delete /var/www/html/assets/frappe /assets
rsync -a --delete /var/www/html/assets/erpnext /assets
chmod -R 755 /assets chmod -R 755 /assets
@ -29,7 +28,12 @@ if [[ -z "$FRAPPE_SOCKETIO_PORT" ]]; then
export FRAPPE_SOCKETIO_PORT=9000 export FRAPPE_SOCKETIO_PORT=9000
fi fi
envsubst "${API_HOST} ${API_PORT} ${FRAPPE_PY} ${FRAPPE_PY_PORT} ${FRAPPE_SOCKETIO} ${FRAPPE_SOCKETIO_PORT}" \ envsubst '${API_HOST}
${API_PORT}
${FRAPPE_PY}
${FRAPPE_PY_PORT}
${FRAPPE_SOCKETIO}
${FRAPPE_SOCKETIO_PORT}' \
< /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
exec "$@" exec "$@"