From 01c8798e4e42424cfcffea1f4749d0ec97d3fb5d Mon Sep 17 00:00:00 2001
From: Daniel Tomcej <daniel.tomcej@gmail.com>
Date: Mon, 3 Jun 2019 03:28:07 -0600
Subject: [PATCH] Update docker api version

---
 pkg/provider/docker/docker.go         | 12 +++++++-----
 pkg/provider/docker/docker_unix.go    |  8 --------
 pkg/provider/docker/docker_windows.go |  6 ------
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 pkg/provider/docker/docker_unix.go
 delete mode 100644 pkg/provider/docker/docker_windows.go

diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go
index f700f5aba..d2bd3e684 100644
--- a/pkg/provider/docker/docker.go
+++ b/pkg/provider/docker/docker.go
@@ -31,12 +31,16 @@ import (
 )
 
 const (
+	// 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"
-	// DefaultTemplateRule The default template for the default rule.
-	DefaultTemplateRule = "Host(`{{ normalize .Name }}`)"
 )
 
+// DefaultTemplateRule The default template for the default rule.
+const DefaultTemplateRule = "Host(`{{ normalize .Name }}`)"
+
 var _ provider.Provider = (*Provider)(nil)
 
 // Provider holds configurations of the provider.
@@ -123,11 +127,9 @@ 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/pkg/provider/docker/docker_unix.go b/pkg/provider/docker/docker_unix.go
deleted file mode 100644
index 347b16710..000000000
--- a/pkg/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/pkg/provider/docker/docker_windows.go b/pkg/provider/docker/docker_windows.go
deleted file mode 100644
index ff0a873cb..000000000
--- a/pkg/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"
-)