Merge pull request #1475 from progrium/josegonzalez-patch-1
Fix issue where restart on failure option overrode existing DOCKER_ARGS
This commit is contained in:
commit
a1d8cc23b9
1 file changed
+1
-1
@@ -94,7 +94,7 @@ case "$1" in
|
|||||||
|
|
||||||
# start the app
|
# start the app
|
||||||
DOCKER_ARGS=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
|
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)
|
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