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

refactor: remove unused IS_HEROKUISH_CONTAINER argument

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2017-09-03 00:48:03 -04:00
committed by Michael Hobbs
parent 20dca9fd46
commit 7fe2f8593c
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/checks/subcommands/run
View File

@@ -58,7 +58,7 @@ check_process() {
dokku_log_info1 "Running checks for app ($APP.$PROC_TYPE.$CONTAINER_INDEX)" dokku_log_info1 "Running checks for app ($APP.$PROC_TYPE.$CONTAINER_INDEX)"
CONTAINER_ID=$(< "$DOKKU_CONTAINER_ID_FILE") 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")" 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" plugn trigger check-deploy "$APP" "$CONTAINER_ID" "$PROC_TYPE" "$PORT" "$IP"
} }

2
plugins/common/functions
View File

@@ -617,7 +617,7 @@ dokku_deploy_cmd() {
cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD) cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD)
fi 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") port=$(plugn trigger network-get-port "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$cid")
kill_new() { kill_new() {

4
plugins/network/network.go
View File

@@ -13,7 +13,7 @@ import (
) )
// GetContainerIpaddress returns the ipaddr for a given app container // 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" { if procType != "web" {
return "" return ""
} }
@@ -127,7 +127,7 @@ func BuildConfig(appName string) {
continue continue
} }
ipAddress := GetContainerIpaddress(appName, procType, isHerokuishContainer, containerID) ipAddress := GetContainerIpaddress(appName, procType, containerID)
port := GetContainerPort(appName, procType, isHerokuishContainer, containerID) port := GetContainerPort(appName, procType, isHerokuishContainer, containerID)
if ipAddress != "" { if ipAddress != "" {

6
plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go
View File

@@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"os" "os"
common "github.com/dokku/dokku/plugins/common"
network "github.com/dokku/dokku/plugins/network" network "github.com/dokku/dokku/plugins/network"
) )
@@ -14,9 +13,8 @@ func main() {
flag.Parse() flag.Parse()
appName := flag.Arg(0) appName := flag.Arg(0)
procType := flag.Arg(1) procType := flag.Arg(1)
isHerokuishContainer := common.ToBool(flag.Arg(2)) containerID := flag.Arg(2)
containerID := flag.Arg(3)
ipAddress := network.GetContainerIpaddress(appName, procType, isHerokuishContainer, containerID) ipAddress := network.GetContainerIpaddress(appName, procType, containerID)
fmt.Fprintln(os.Stdout, ipAddress) fmt.Fprintln(os.Stdout, ipAddress)
} }