Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Installation
------------

* Binaries: [On the releases page](https://github.com/Shimmur/shipspotter/releases)
* From Source: `go get github.com/Shimmur/shipspotter`
* From Source: `go install github.com/Shimmur/shipspotter@latest`

Basic Usage
-----------
Expand Down
23 changes: 22 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,34 @@ func findContainerByID(client *docker.Client, id string) (*docker.APIContainers,
return nil, fmt.Errorf("Unable to match container ID: %s", id)
}

// fallback if findIPForContainer's container.NetworkSettings.IPAddress is empty
func findIPInNetworks(networks map[string]docker.ContainerNetwork) (string, error) {
var ip string
for _, network := range networks {
ip = network.IPAddress
}
if ip == "" {
return "", fmt.Errorf("Unable to find Container IP in NetworkSettings")
}
return ip, nil
}

func findIPForContainer(client *docker.Client, cntnr *docker.APIContainers) (string, error) {
container, err := client.InspectContainer(cntnr.ID)
if err != nil {
return "", fmt.Errorf("Unable to inspect container: %s", err)
}

ip := container.NetworkSettings.IPAddress
var ip string
if container.NetworkSettings.IPAddress == "" {
ipFromNetworks, err := findIPInNetworks(container.NetworkSettings.Networks)
if err != nil {
log.Fatal(err)
}
ip = ipFromNetworks
} else {
ip = container.NetworkSettings.IPAddress
}
log.Infof("Container IP address: %s", ip)

return ip, nil
Expand Down