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

Merge pull request #3899 from dokku/remove-extra-quotes

Browse Source 
Drop unnecessary quotes on docker inspect calls
This commit is contained in:
Jose Diaz-Gonzalez
2020-03-18 19:00:08 -04:00
committed by GitHub
parent 99fcd613fe 5a2decb4e4
commit 0b8fbfdeb9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/network/network.go
View File

@@ -95,16 +95,16 @@ func BuildConfig(appName string) {
// GetContainerIpaddress returns the ipaddr for a given app container
func GetContainerIpaddress(appName, processType, containerID string) (ipAddr string) {
if b, err := common.DockerInspect(containerID, "'{{ .HostConfig.NetworkMode }}'"); err == nil {
if b, err := common.DockerInspect(containerID, "{{ .HostConfig.NetworkMode }}"); err == nil {
if string(b[:]) == "host" {
return "127.0.0.1"
}
}
b, err := common.DockerInspect(containerID, "'{{.NetworkSettings.Networks.bridge.IPAddress}}'")
b, err := common.DockerInspect(containerID, "{{.NetworkSettings.Networks.bridge.IPAddress}}")
if err != nil || len(b) == 0 {
// docker < 1.9 compatibility
b, err = common.DockerInspect(containerID, "'{{ .NetworkSettings.IPAddress }}'")
b, err = common.DockerInspect(containerID, "{{ .NetworkSettings.IPAddress }}")
}
if err == nil {