From 646fd467abfe19f3fa7a115207c0ea94b9cb2bb1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Sep 2015 00:55:05 -0400 Subject: [PATCH] use config_set function in domains and 00_dokku-standard --- plugins/00_dokku-standard/commands | 2 +- plugins/domains/commands | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands index 8816bb176..2a450c864 100755 --- a/plugins/00_dokku-standard/commands +++ b/plugins/00_dokku-standard/commands @@ -42,7 +42,7 @@ case "$1" in dockerfile) # extract first port from Dockerfile DOCKERFILE_PORT=$(get_dockerfile_exposed_port Dockerfile) - [[ -n "$DOCKERFILE_PORT" ]] && dokku config:set --no-restart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT + [[ -n "$DOCKERFILE_PORT" ]] && config_set --no-restart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT pluginhook pre-build-dockerfile "$APP" [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache" diff --git a/plugins/domains/commands b/plugins/domains/commands index 72ef45c97..73acd648e 100755 --- a/plugins/domains/commands +++ b/plugins/domains/commands @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x source "$PLUGIN_PATH/common/functions" +source "$PLUGIN_PATH/config/functions" RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}" @@ -50,7 +51,7 @@ case "$1" in fi if [[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]];then dokku_log_info2 "unsupported vhost config found. disabling vhost support" - dokku config:set --no-restart $APP NO_VHOST=1 + config_set --no-restart $APP NO_VHOST=1 else if [[ -f "$DOKKU_ROOT/VHOST" ]]; then dokku_log_info1 "Creating new $VHOST_PATH..."