ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6284 from peb-adr/fix-proxy-dev 

fix missing caddy_base when rebuilding
This commit is contained in:
GabrielInTheWorld 2021-11-22 11:58:31 +01:00 committed by GitHub
parent 77d672544c 004ff453bc
commit 0ab17c3597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/entrypoint
View File

@ -7,6 +7,7 @@ base=/caddy_base.json
HTTPS_CERT_FILE="${HTTPS_CERT_FILE:-/certs/cert.pem}"
HTTPS_KEY_FILE="${HTTPS_KEY_FILE:-/certs/key.pem}"
cp $base $config
# set defaults in base
ACTION_HOST="${ACTION_HOST:-backend}" ACTION_PORT="${ACTION_PORT:-9002}" \
PRESENTER_HOST="${PRESENTER_HOST:-backend}" PRESENTER_PORT="${PRESENTER_PORT:-9003}" \
@ -17,11 +18,11 @@ MEDIA_HOST="${MEDIA_HOST:-media}" MEDIA_PORT="${MEDIA_PORT:-9006}" \
MANAGE_HOST="${MANAGE_HOST:-manage}" MANAGE_PORT="${MANAGE_PORT:-9008}" \
CLIENT_HOST="${CLIENT_HOST:-client}" CLIENT_PORT="${CLIENT_PORT:-9001}" \
VOTE_HOST="${VOTE_HOST:-vote}" VOTE_PORT="${VOTE_PORT:-9013}" \
envsubst < "$base" > "$base.out" && mv -f "$base.out" "$base"
envsubst < "$config" > "$config.out" && mv -f "$config.out" "$config"
jq_write() {
filter=$1
jq "$filter" "$base" > "$base.out" && mv -f "$base.out" "$base"
jq "$filter" "$config" > "$config.out" && mv -f "$config.out" "$config"
}
### HTTPS ###
@ -52,6 +53,4 @@ else
fi
fi
mv "$base" "$config"
exec "$@"