github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 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"