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

fix: cleanup issues retrieving the port and ipaddr for a container

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-04-21 16:28:56 -06:00
committed by Michael Hobbs
parent 1a2ed28e5b
commit dfad37ba23
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/common/functions
View File

@@ -584,7 +584,6 @@ dokku_deploy_cmd() {
[[ -n "$DOKKU_HEROKUISH" ]] && local START_CMD="/start $PROC_TYPE"
if [[ -z "$DOKKU_HEROKUISH" ]]; then
local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || 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 START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
@@ -611,8 +610,8 @@ dokku_deploy_cmd() {
local id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD)
fi
ipaddr=$(plugn trigger network-get-ipaddr "$APP" "PROC_TYPE" "$id")
port=$(plugn trigger network-get-port "$APP" "PROC_TYPE" "$id")
ipaddr=$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$id")
port=$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$id")
kill_new() {
declare desc="wrapper function to kill newly started app container"

8
plugins/network/functions
View File

@@ -111,7 +111,7 @@ network-get-container-listeners() {
network-get-container-port() {
declare desc="Return the port for a given app container"
declare APP="$1" PROC_TYPE="$2" CONTAINER_ID="$3"
declare APP="$1" PROC_TYPE="$2" CONTAINER_ID="$3" DOKKU_HEROKUISH="$4"
local DOKKU_IS_APP_PROXY_ENABLED
local PORT=5000
@@ -119,11 +119,6 @@ network-get-container-port() {
return
fi
local IMAGE_TAG="$(get_running_image_tag "$APP")"
local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
is_image_herokuish_based "$IMAGE" && local DOKKU_HEROKUISH=true
if [[ -z "$DOKKU_HEROKUISH" ]]; then
local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
fi
@@ -138,6 +133,7 @@ network-get-container-port() {
done
fi
DOKKU_IS_APP_PROXY_ENABLED="$(is_app_proxy_enabled "$APP")"
if [[ "$DOKKU_IS_APP_PROXY_ENABLED" != "true" ]]; then
PORT="$(docker port "$CONTAINER_ID" "$PORT" | sed 's/[0-9.]*://')"
fi