fix: check IS_HEROKUISH_CONTAINER value check
This commit is contained in:
1 parent
b409af602a
commit
0cc9e42c59
2 files changed
+9
-6
No files matched your search
@@ -539,11 +539,14 @@ dokku_deploy_cmd() {
|
|||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
|
||||||
|
|
||||||
[[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
|
[[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
|
||||||
local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
|
local APP="$1" IMAGE_TAG="$2"
|
||||||
|
local DOKKU_HEROKUISH IMAGE
|
||||||
|
DOKKU_HEROKUISH=false
|
||||||
|
IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
|
plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
|
||||||
|
|
||||||
is_image_herokuish_based "$IMAGE" && local DOKKU_HEROKUISH=true
|
is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
|
||||||
local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
||||||
local oldids=$(get_app_container_ids "$APP")
|
local oldids=$(get_app_container_ids "$APP")
|
||||||
|
|
||||||
@@ -581,9 +584,9 @@ dokku_deploy_cmd() {
|
|||||||
DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
|
DOCKER_ARGS+=" -e DYNO=$PROC_TYPE.$CONTAINER_INDEX "
|
||||||
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
||||||
|
|
||||||
[[ -n "$DOKKU_HEROKUISH" ]] && local START_CMD="/start $PROC_TYPE"
|
[[ "$DOKKU_HEROKUISH" == "true" ]] && local START_CMD="/start $PROC_TYPE"
|
||||||
|
|
||||||
if [[ -z "$DOKKU_HEROKUISH" ]]; then
|
if [[ "$DOKKU_HEROKUISH" == "false" ]]; then
|
||||||
local DOKKU_DOCKERFILE_START_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_START_CMD || true)
|
local DOKKU_DOCKERFILE_START_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_START_CMD || true)
|
||||||
local DOKKU_PROCFILE_START_CMD=$(get_cmd_from_procfile "$APP" "$PROC_TYPE")
|
local DOKKU_PROCFILE_START_CMD=$(get_cmd_from_procfile "$APP" "$PROC_TYPE")
|
||||||
local START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
|
local START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ network-compute-container-ports() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$IS_HEROKUISH_CONTAINER" ]]; then
|
if [[ "$IS_HEROKUISH_CONTAINER" == "false" ]]; then
|
||||||
DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
|
DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ network-get-container-port() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$IS_HEROKUISH_CONTAINER" ]]; then
|
if [[ "$IS_HEROKUISH_CONTAINER" == "false" ]]; then
|
||||||
local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
|
local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user