Merge pull request #1097 from progrium/1041_mh-use-config-set-no-restart
use config:set-norestart in domains plugin. config:get for dockerfile port. closes #1041
This commit is contained in:
commit
d16a5aede6
2 files changed
+2
-2
No files matched your search
@@ -77,7 +77,7 @@ case "$1" in
|
|||||||
|
|
||||||
is_image_buildstep_based "$IMAGE" && DOKKU_BUILDSTEP=true
|
is_image_buildstep_based "$IMAGE" && DOKKU_BUILDSTEP=true
|
||||||
[[ -n "$DOKKU_BUILDSTEP" ]] && START_CMD="/start web"
|
[[ -n "$DOKKU_BUILDSTEP" ]] && START_CMD="/start web"
|
||||||
[[ -z "$DOKKU_BUILDSTEP" ]] && eval "$(grep DOKKU_DOCKERFILE_PORT $DOKKU_ROOT/$APP/ENV)"
|
[[ -z "$DOKKU_BUILDSTEP" ]] && DOKKU_DOCKERFILE_PORT=$(dokku config:get $APP DOKKU_DOCKERFILE_PORT || true)
|
||||||
|
|
||||||
if [[ "$BIND_EXTERNAL" = "false" ]];then
|
if [[ "$BIND_EXTERNAL" = "false" ]];then
|
||||||
port=${DOKKU_DOCKERFILE_PORT:=5000}
|
port=${DOKKU_DOCKERFILE_PORT:=5000}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
if [[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]];then
|
if [[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]];then
|
||||||
echo "unsupported vhost config found. disabling vhost support"
|
echo "unsupported vhost config found. disabling vhost support"
|
||||||
[[ ! $(grep -q NO_VHOST "$DOKKU_ROOT/$APP/ENV") ]] && echo "export NO_VHOST='1'" >> "$DOKKU_ROOT/$APP/ENV"
|
dokku config:set-norestart $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..."
|
||||||
|
|||||||
Reference in new issue
Block a user