Retrieve default docker args a single time
This commit is contained in:
1 parent
b9ecb32d3f
commit
1e543afb78
1 file changed
+4
-2
@@ -88,6 +88,8 @@ case "$1" in
|
|||||||
DOKKU_SKIP_ALL_CHECKS=${DOKKU_APP_SKIP_ALL_CHECKS:="$DOKKU_GLOBAL_SKIP_ALL_CHECKS"}
|
DOKKU_SKIP_ALL_CHECKS=${DOKKU_APP_SKIP_ALL_CHECKS:="$DOKKU_GLOBAL_SKIP_ALL_CHECKS"}
|
||||||
DOKKU_SKIP_DEFAULT_CHECKS=${DOKKU_APP_SKIP_DEFAULT_CHECKS:="$DOKKU_GLOBAL_SKIP_DEFAULT_CHECKS"}
|
DOKKU_SKIP_DEFAULT_CHECKS=${DOKKU_APP_SKIP_DEFAULT_CHECKS:="$DOKKU_GLOBAL_SKIP_DEFAULT_CHECKS"}
|
||||||
|
|
||||||
|
DOKKU_DEFAULT_DOCKER_ARGS=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)
|
||||||
|
|
||||||
while read line || [[ -n "$line" ]]; do
|
while read line || [[ -n "$line" ]]; do
|
||||||
TRIM=${line%#*}
|
TRIM=${line%#*}
|
||||||
PROC_TYPE=${TRIM%%=*}
|
PROC_TYPE=${TRIM%%=*}
|
||||||
@@ -101,9 +103,9 @@ case "$1" in
|
|||||||
DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX"
|
DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX"
|
||||||
|
|
||||||
# start the app
|
# start the app
|
||||||
DOCKER_ARGS=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
|
DOCKER_ARGS="$DOKKU_DEFAULT_DOCKER_ARGS"
|
||||||
|
DOCKER_ARGS+=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
|
||||||
DOCKER_ARGS+=" --restart=on-failure:$DOKKU_RESTART_LIMIT"
|
DOCKER_ARGS+=" --restart=on-failure:$DOKKU_RESTART_LIMIT"
|
||||||
DOCKER_ARGS+=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)
|
|
||||||
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
||||||
BIND_EXTERNAL=$(plugn trigger bind-external-ip $APP)
|
BIND_EXTERNAL=$(plugn trigger bind-external-ip $APP)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user