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

fix: always pass in IS_HEROKUISH_CONTAINER

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-04-22 14:40:10 -06:00
committed by Michael Hobbs
parent 06a7cb2a3d
commit 4949d1e33e
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/common/functions
View File

@@ -590,7 +590,7 @@ dokku_deploy_cmd() {
fi
if [[ "$PROC_TYPE" == "web" ]]; then
ports="$(plugn trigger network-compute-ports "$APP" "$PROC_TYPE")"
ports="$(plugn trigger network-compute-ports "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH")"
local DOKKU_DOCKER_PORT_ARGS=""
local DOKKU_PORT=""
for port in "${ports[@]}"; do
@@ -610,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" "$DOKKU_HEROKUISH")
ipaddr=$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$id")
port=$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$id")
kill_new() {
declare desc="wrapper function to kill newly started app container"