github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

use config_set function in domains and 00_dokku-standard

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-01 00:55:05 -04:00
parent 7b5ea80ea4
commit 646fd467ab
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/00_dokku-standard/commands
View File

@@ -42,7 +42,7 @@ case "$1" in
dockerfile) dockerfile)
# extract first port from Dockerfile # extract first port from Dockerfile
DOCKERFILE_PORT=$(get_dockerfile_exposed_port 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" pluginhook pre-build-dockerfile "$APP"
[[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache" [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"

3
plugins/domains/commands
View File

@@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_PATH/common/functions" source "$PLUGIN_PATH/common/functions"
source "$PLUGIN_PATH/config/functions"
RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}" RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}"
@@ -50,7 +51,7 @@ case "$1" in
fi fi
if [[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]];then if [[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]];then
dokku_log_info2 "unsupported vhost config found. disabling vhost support" 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 else
if [[ -f "$DOKKU_ROOT/VHOST" ]]; then if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
dokku_log_info1 "Creating new $VHOST_PATH..." dokku_log_info1 "Creating new $VHOST_PATH..."