Merge pull request #2937 from dokku/mh/fix/strip-restart-flag

strip restart flag from app_user_pre_deploy_trigger
This commit is contained in:
Michael Hobbs authored and GitHub committed 2017-10-09 16:03:04 -07:00
commit 6b340c69b5
1 file changed
+2
+2
View File
@@ -28,6 +28,8 @@ app_user_pre_deploy_trigger() {
if [[ -n "$APP_PATHS" ]]; then if [[ -n "$APP_PATHS" ]]; then
CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs) CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" | xargs) DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" | xargs)
# strip --restart args from DOCKER_ARGS
DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS")
fi fi
if [[ "$DOKKU_APP_TYPE" == "herokuish" ]] && [[ -n "$CONTAINER_PATHS" ]]; then if [[ "$DOKKU_APP_TYPE" == "herokuish" ]] && [[ -n "$CONTAINER_PATHS" ]]; then