Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NetworkMode to RuntimeContainer #287

Closed
wants to merge 3 commits into from
Closed

Add NetworkMode to RuntimeContainer #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1040e7
Add NetworkMode to RuntimeContainer
anthonyraymond May 30, 2018
eba2e10
Fix test warnings
anthonyraymond May 30, 2018
b3774ec
Fix failling tests
anthonyraymond May 30, 2018
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
1 change: 1 addition & 0 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ type RuntimeContainer struct {
Gateway string
Name string
Hostname string
NetworkMode string
Image DockerImage
Env map[string]string
Volumes map[string]Volume
Expand Down
1 change: 1 addition & 0 deletions generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ func (g *generator) getContainers() ([]*RuntimeContainer, error) {
Name: strings.TrimLeft(container.Name, "/"),
Hostname: container.Config.Hostname,
Gateway: container.NetworkSettings.Gateway,
NetworkMode: container.HostConfig.NetworkMode,
Addresses: []Address{},
Networks: []Network{},
Env: make(map[string]string),
Expand Down
3 changes: 3 additions & 0 deletions generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ func TestGenerateFromEvents(t *testing.T) {
Cmd: []string{"/bin/sh"},
Image: "base:latest",
},
HostConfig: &docker.HostConfig{
NetworkMode: "container:d246e2c9e3d465d96359c942e91de493f6d51a01ba33900d865180d64c34ee91",
},
State: docker.State{
Running: true,
Pid: 400,
Expand Down
8 changes: 4 additions & 4 deletions template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestKeysEmpty(t *testing.T) {
}

if len(input) != vk.Len() {
t.Fatalf("Incorrect key count; expected %s, got %s", len(input), vk.Len())
t.Fatalf("Incorrect key count; expected %d, got %d", len(input), vk.Len())
}
}

Expand Down Expand Up @@ -269,11 +269,11 @@ func TestGroupByMulti(t *testing.T) {
}

if len(groups["demo1.localhost"]) != 2 {
t.Fatalf("expected 2 got %s", len(groups["demo1.localhost"]))
t.Fatalf("expected 2 got %d", len(groups["demo1.localhost"]))
}

if len(groups["demo2.localhost"]) != 1 {
t.Fatalf("expected 1 got %s", len(groups["demo2.localhost"]))
t.Fatalf("expected 1 got %d", len(groups["demo2.localhost"]))
}
if groups["demo2.localhost"][0].(RuntimeContainer).ID != "3" {
t.Fatalf("expected 2 got %s", groups["demo2.localhost"][0].(RuntimeContainer).ID)
Expand Down Expand Up @@ -785,7 +785,7 @@ func TestJson(t *testing.T) {
t.Fatal(err)
}
if len(decoded) != len(containers) {
t.Fatal("Incorrect unmarshaled container count. Expected %d, got %d.", len(containers), len(decoded))
t.Fatalf("Incorrect unmarshaled container count. Expected %d, got %d.", len(containers), len(decoded))
}
}

Expand Down
4 changes: 2 additions & 2 deletions utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestDockerHostEndpoint(t *testing.T) {

endpoint, err := GetEndpoint("")
if err != nil {
t.Fatal("%s", err)
t.Fatalf("%s", err)
}

if endpoint != "tcp://127.0.0.1:4243" {
Expand All @@ -48,7 +48,7 @@ func TestDockerFlagEndpoint(t *testing.T) {
// flag value should override DOCKER_HOST and default value
endpoint, err := GetEndpoint("tcp://127.0.0.1:5555")
if err != nil {
t.Fatal("%s", err)
t.Fatalf("%s", err)
}
if endpoint != "tcp://127.0.0.1:5555" {
t.Fatalf("Expected tcp://127.0.0.1:5555, got %s", endpoint)
Expand Down