Merge branch 'master' of github.com:dokku/dokku into feature-config-golang

This commit is contained in:
Alex committed 2017-10-16 20:22:28 -04:00
commit 6780d53c77
5 files changed
+7 -5

No files matched your search

+2
View File
@@ -29,6 +29,8 @@ app_user_pre_deploy_trigger() {
if [[ -n "$APP_PATHS" ]]; then
CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
# strip --restart args from DOCKER_ARGS
DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS")
eval "ARG_ARRAY=($DOCKER_ARGS)"
fi