Auto-merging via docker-versions-create

This commit is contained in:
Geoff Bourne
2020-06-20 15:45:29 -05:00
8 changed files with 109 additions and 10 deletions
+7 -2
View File
@@ -33,6 +33,7 @@ fi
if [[ $PROXY ]]; then
export http_proxy="$PROXY"
export https_proxy="$PROXY"
export JAVA_TOOL_OPTIONS+="-Djava.net.useSystemProxies=true"
log "INFO: Giving proxy time to startup..."
sleep 5
fi
@@ -112,11 +113,15 @@ case "${TYPE^^}" in
;;
MAGMA)
exec ${SCRIPTS:-/}start-magma "$@"
exec ${SCRIPTS:-/}start-deployMagma "$@"
;;
MOHIST)
exec ${SCRIPTS:-/}start-mohist "$@"
exec ${SCRIPTS:-/}start-deployMohist "$@"
;;
CATSERVER)
exec ${SCRIPTS:-/}start-deployCatserver "$@"
;;
*)