From 8e992c7cfb5da2dd5590ddd4e11a0fceb7495593 Mon Sep 17 00:00:00 2001 From: Daniel Tomcej Date: Mon, 3 Jun 2019 03:28:07 -0600 Subject: [PATCH] Update docker api version --- provider/docker/docker.go | 9 +++++---- provider/docker/docker_unix.go | 8 -------- provider/docker/docker_windows.go | 6 ------ 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 provider/docker/docker_unix.go delete mode 100644 provider/docker/docker_windows.go diff --git a/provider/docker/docker.go b/provider/docker/docker.go index 19543d67b..4a81614f3 100644 --- a/provider/docker/docker.go +++ b/provider/docker/docker.go @@ -28,7 +28,9 @@ import ( ) const ( - // SwarmAPIVersion is a constant holding the version of the Provider API traefik will use + // DockerAPIVersion is a constant holding the version of the Provider API traefik will use + DockerAPIVersion = "1.24" + // SwarmAPIVersion is a constant holding the version of the Provider API traefik will use. SwarmAPIVersion = "1.24" ) @@ -110,11 +112,10 @@ func (p *Provider) createClient() (client.APIClient, error) { "User-Agent": "Traefik " + version.Version, } - var apiVersion string + apiVersion := DockerAPIVersion + if p.SwarmMode { apiVersion = SwarmAPIVersion - } else { - apiVersion = DockerAPIVersion } return client.NewClient(p.Endpoint, apiVersion, httpClient, httpHeaders) diff --git a/provider/docker/docker_unix.go b/provider/docker/docker_unix.go deleted file mode 100644 index 347b16710..000000000 --- a/provider/docker/docker_unix.go +++ /dev/null @@ -1,8 +0,0 @@ -// +build !windows - -package docker - -const ( - // DockerAPIVersion is a constant holding the version of the Provider API traefik will use - DockerAPIVersion = "1.21" -) diff --git a/provider/docker/docker_windows.go b/provider/docker/docker_windows.go deleted file mode 100644 index ff0a873cb..000000000 --- a/provider/docker/docker_windows.go +++ /dev/null @@ -1,6 +0,0 @@ -package docker - -const ( - // DockerAPIVersion is a constant holding the version of the Provider API traefik will use - DockerAPIVersion string = "1.24" -)