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

style tweaks

Browse Source
This commit is contained in:
Michael Hobbs
2017-10-02 16:50:05 -07:00
parent b099d2c389
commit 8654783131
22 changed files with 101 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
plugins/network/network.go
View File

@@ -5,33 +5,27 @@ import (
"strconv"
"strings"
common "github.com/dokku/dokku/plugins/common"
config "github.com/dokku/dokku/plugins/config"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
sh "github.com/codeskyblue/go-sh"
)
// ValidProperties is a map of all valid network properties
var ValidProperties = map[string]bool{
"bind-all-interfaces": true,
}
// DefaultPropertyValues is a map of all valid network properties with corresponding default property values
var DefaultPropertyValues = map[string]string{
"bind-all-interfaces": "false",
}
var (
// DefaultProperties is a map of all valid network properties with corresponding default property values
DefaultProperties = map[string]string{
"bind-all-interfaces": "false",
}
)
// BuildConfig builds network config files
func BuildConfig(appName string) {
err := common.VerifyAppName(appName)
if err != nil {
if err := common.VerifyAppName(appName); err != nil {
common.LogFail(err.Error())
}
if !common.IsDeployed(appName) {
return
}
appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/")
scaleFile := strings.Join([]string{appRoot, "DOKKU_SCALE"}, "/")
if !common.FileExists(scaleFile) {
@@ -40,7 +34,6 @@ func BuildConfig(appName string) {
image := common.GetAppImageName(appName, "", "")
isHerokuishContainer := common.IsImageHerokuishBased(image)
common.LogInfo1(fmt.Sprintf("Ensuring network configuration is in sync for %s", appName))
lines, err := common.FileToSlice(scaleFile)
if err != nil {
@@ -93,9 +86,9 @@ func BuildConfig(appName string) {
}
// GetContainerIpaddress returns the ipaddr for a given app container
func GetContainerIpaddress(appName string, procType string, containerID string) string {
func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string) {
if procType != "web" {
return ""
return
}
b, err := common.DockerInspect(containerID, "'{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'")
@@ -108,18 +101,16 @@ func GetContainerIpaddress(appName string, procType string, containerID string)
return string(b[:])
}
return ""
return
}
// GetContainerPort returns the port for a given app container
func GetContainerPort(appName string, procType string, isHerokuishContainer bool, containerID string) string {
func GetContainerPort(appName, procType string, isHerokuishContainer bool, containerID string) (port string) {
if procType != "web" {
return ""
return
}
dockerfilePorts := make([]string, 0)
port := ""
if !isHerokuishContainer {
configValue := config.GetWithDefault(appName, "DOKKU_DOCKERFILE_PORTS", "")
if configValue != "" {
@@ -145,15 +136,16 @@ func GetContainerPort(appName string, procType string, isHerokuishContainer bool
port = "5000"
}
return port
return
}
// GetDefaultValue returns the default value for a given property
func GetDefaultValue(property string) string {
if ValidProperties[property] {
return DefaultPropertyValues[property]
func GetDefaultValue(property string) (value string) {
value, ok := DefaultProperties[property]
if ok {
return
}
return ""
return
}
// HasNetworkConfig returns whether the network configuration for a given app exists

2
plugins/network/src/subcommands/rebuild/rebuild.go
View File

@@ -3,7 +3,7 @@ package main
import (
"flag"
network "github.com/dokku/dokku/plugins/network"
"github.com/dokku/dokku/plugins/network"
)
// rebuilds network settings for an app

4
plugins/network/src/subcommands/rebuildall/rebuildall.go
View File

@@ -1,8 +1,8 @@
package main
import (
common "github.com/dokku/dokku/plugins/common"
network "github.com/dokku/dokku/plugins/network"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/network"
)
// rebuilds network settings for all apps

6
plugins/network/src/subcommands/set/set.go
View File

@@ -3,8 +3,8 @@ package main
import (
"flag"
common "github.com/dokku/dokku/plugins/common"
network "github.com/dokku/dokku/plugins/network"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/network"
)
// set or clear a network property for an app
@@ -18,5 +18,5 @@ func main() {
value = "false"
}
common.CommandPropertySet("network", appName, property, value, network.ValidProperties)
common.CommandPropertySet("network", appName, property, value, network.DefaultProperties)
}

7
plugins/network/src/triggers/install/install.go
View File

@@ -3,14 +3,13 @@ package main
import (
"fmt"
common "github.com/dokku/dokku/plugins/common"
proxy "github.com/dokku/dokku/plugins/proxy"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/proxy"
)
// runs the install step for the network plugin
func main() {
err := common.PropertySetup("network")
if err != nil {
if err := common.PropertySetup("network"); err != nil {
common.LogFail(fmt.Sprintf("Unable to install the network plugin: %s", err.Error()))
}

2
plugins/network/src/triggers/network-build-config/network-build-config.go
View File

@@ -3,7 +3,7 @@ package main
import (
"flag"
network "github.com/dokku/dokku/plugins/network"
"github.com/dokku/dokku/plugins/network"
)
// rebuilds network settings for an app

4
plugins/network/src/triggers/network-compute-ports/network-compute-ports.go
View File

@@ -6,8 +6,8 @@ import (
"os"
"strings"
common "github.com/dokku/dokku/plugins/common"
config "github.com/dokku/dokku/plugins/config"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
)
// computes the ports for a given app container

2
plugins/network/src/triggers/network-config-exists/network-config-exists.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"os"
network "github.com/dokku/dokku/plugins/network"
"github.com/dokku/dokku/plugins/network"
)
// write the ipaddress to stdout for a given app container

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

@@ -5,7 +5,7 @@ import (
"fmt"
"os"
network "github.com/dokku/dokku/plugins/network"
"github.com/dokku/dokku/plugins/network"
)
// write the ipaddress to stdout for a given app container

4
plugins/network/src/triggers/network-get-listeners/network-get-listeners.go
View File

@@ -1,13 +1,13 @@
package main
import (
"path/filepath"
"flag"
"fmt"
"os"
"path/filepath"
"strings"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
)
// returns the listeners (host:port combinations) for a given app container

2
plugins/network/src/triggers/network-get-port/network-get-port.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"os"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
network "github.com/dokku/dokku/plugins/network"
)

2
plugins/network/src/triggers/network-get-property/network-get-property.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"os"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
network "github.com/dokku/dokku/plugins/network"
)

2
plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go
View File

@@ -6,7 +6,7 @@ import (
"os"
"strings"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
)
// writes the ip to disk

2
plugins/network/src/triggers/network-write-port/network-write-port.go
View File

@@ -6,7 +6,7 @@ import (
"os"
"strings"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
)
// writes the port to disk

2
plugins/network/src/triggers/post-create/post-create.go
View File

@@ -3,7 +3,7 @@ package main
import (
"flag"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
)
// set bind-all-interfaces to false by default

2
plugins/network/src/triggers/post-delete/post-delete.go
View File

@@ -3,7 +3,7 @@ package main
import (
"flag"
common "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/common"
)
// write the port to stdout for a given app container