From 813ed6df3d855d29cfd16ecf5b5e13c06ac493b5 Mon Sep 17 00:00:00 2001 From: Timofey Date: Sat, 17 Apr 2021 16:34:49 +0300 Subject: [PATCH] Set minimal supported docker version --- app/discovery/provider/docker.go | 8 +++++--- app/discovery/provider/docker_test.go | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/discovery/provider/docker.go b/app/discovery/provider/docker.go index a660b41..e10f6ec 100644 --- a/app/discovery/provider/docker.go +++ b/app/discovery/provider/docker.go @@ -313,9 +313,11 @@ func NewDockerClient(host, network string) DockerClient { } func (d *dockerClient) ListContainers() ([]containerInfo, error) { - // const APIVersion = "v1.41" - // resp, err := d.client.Get(fmt.Sprintf("http://localhost/%s/containers/json", APIVersion)) - resp, err := d.client.Get("http://localhost/containers/json") + // Minimum API version that returns attached networks + // docs.docker.com/engine/api/version-history/#v122-api-changes + const APIVersion = "v1.22" + + resp, err := d.client.Get(fmt.Sprintf("http://localhost/%s/containers/json", APIVersion)) if err != nil { return nil, fmt.Errorf("failed connection to docker socket: %w", err) } diff --git a/app/discovery/provider/docker_test.go b/app/discovery/provider/docker_test.go index 7da51cb..23f07b5 100644 --- a/app/discovery/provider/docker_test.go +++ b/app/discovery/provider/docker_test.go @@ -174,7 +174,7 @@ func TestDocker_refresh(t *testing.T) { func TestDockerClient(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - require.Equal(t, "/containers/json", r.URL.Path) + require.Equal(t, `/v1.22/containers/json`, r.URL.Path) // obtained using curl --unix-socket /var/run/docker.sock http://localhost/v1.41/containers/json resp, err := ioutil.ReadFile("testdata/containers.json")