diff --git a/plugins/checks/subcommands/run b/plugins/checks/subcommands/run index dd9c6f935..d1f9bdfc7 100755 --- a/plugins/checks/subcommands/run +++ b/plugins/checks/subcommands/run @@ -58,7 +58,7 @@ check_process() { dokku_log_info1 "Running checks for app ($APP.$PROC_TYPE.$CONTAINER_INDEX)" CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE") - IP="$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$IS_HEROKUISH_CONTAINER" "$CONTAINER_ID")" + IP="$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$CONTAINER_ID")" PORT="$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$IS_HEROKUISH_CONTAINER" "$CONTAINER_ID")" plugn trigger check-deploy "$APP" "$CONTAINER_ID" "$PROC_TYPE" "$PORT" "$IP" } diff --git a/plugins/common/functions b/plugins/common/functions index 8647ab403..000c73f77 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -617,7 +617,7 @@ dokku_deploy_cmd() { cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD) fi - ipaddr=$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$cid") + ipaddr=$(plugn trigger network-get-ipaddr "$APP" "$PROC_TYPE" "$cid") port=$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$cid") kill_new() { diff --git a/plugins/network/network.go b/plugins/network/network.go index 80bb3eaec..69979c1d1 100644 --- a/plugins/network/network.go +++ b/plugins/network/network.go @@ -13,7 +13,7 @@ import ( ) // GetContainerIpaddress returns the ipaddr for a given app container -func GetContainerIpaddress(appName string, procType string, isHerokuishContainer bool, containerID string) string { +func GetContainerIpaddress(appName string, procType string, containerID string) string { if procType != "web" { return "" } @@ -127,7 +127,7 @@ func BuildConfig(appName string) { continue } - ipAddress := GetContainerIpaddress(appName, procType, isHerokuishContainer, containerID) + ipAddress := GetContainerIpaddress(appName, procType, containerID) port := GetContainerPort(appName, procType, isHerokuishContainer, containerID) if ipAddress != "" { diff --git a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go index 46010bbb0..5d06c9330 100644 --- a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go +++ b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go @@ -5,7 +5,6 @@ import ( "fmt" "os" - common "github.com/dokku/dokku/plugins/common" network "github.com/dokku/dokku/plugins/network" ) @@ -14,9 +13,8 @@ func main() { flag.Parse() appName := flag.Arg(0) procType := flag.Arg(1) - isHerokuishContainer := common.ToBool(flag.Arg(2)) - containerID := flag.Arg(3) + containerID := flag.Arg(2) - ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerID) + ipAddress := network.GetContainerIpaddress(appName, procType, containerID) fmt.Fprintln(os.Stdout, ipAddress) }