From a70f9d811c4ab6a6f43c28a5e0acea7e5871f144 Mon Sep 17 00:00:00 2001 From: anthonyraymond Date: Wed, 30 May 2018 22:30:36 +0200 Subject: [PATCH 1/2] Add NetworkMode to RuntimeContainer --- internal/context/context.go | 1 + internal/generator/generator.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/context/context.go b/internal/context/context.go index 0c12db87..0d3af9b6 100644 --- a/internal/context/context.go +++ b/internal/context/context.go @@ -96,6 +96,7 @@ type RuntimeContainer struct { Gateway string Name string Hostname string + NetworkMode string Image DockerImage Env map[string]string Volumes map[string]Volume diff --git a/internal/generator/generator.go b/internal/generator/generator.go index b41c0c59..9dcb1b6d 100644 --- a/internal/generator/generator.go +++ b/internal/generator/generator.go @@ -408,6 +408,7 @@ func (g *generator) getContainers() ([]*context.RuntimeContainer, error) { Name: strings.TrimLeft(container.Name, "/"), Hostname: container.Config.Hostname, Gateway: container.NetworkSettings.Gateway, + NetworkMode: container.HostConfig.NetworkMode, Addresses: []context.Address{}, Networks: []context.Network{}, Env: make(map[string]string), From 69b21927e358d698f3583f4ebb350ed8225f0414 Mon Sep 17 00:00:00 2001 From: anthonyraymond Date: Wed, 30 May 2018 23:05:29 +0200 Subject: [PATCH 2/2] Fix failling tests --- internal/generator/generator_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/generator/generator_test.go b/internal/generator/generator_test.go index 41d8b65b..e968d653 100644 --- a/internal/generator/generator_test.go +++ b/internal/generator/generator_test.go @@ -83,6 +83,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,