Skip to content

Commit

Permalink
Merge pull request #1113 from StefanScherer/fix-docker-api-version-fo…
Browse files Browse the repository at this point in the history
…r-windows

Fix Docker API version for Windows
  • Loading branch information
emilevauge committed Feb 4, 2017
2 parents 71a185c + 434596b commit da5eba1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
2 changes: 0 additions & 2 deletions provider/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ import (
)

const (
// DockerAPIVersion is a constant holding the version of the Docker API traefik will use
DockerAPIVersion string = "1.21"
// SwarmAPIVersion is a constant holding the version of the Docker API traefik will use
SwarmAPIVersion string = "1.24"
// SwarmDefaultWatchTime is the duration of the interval when polling docker
Expand Down
8 changes: 8 additions & 0 deletions provider/docker_unix.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// +build !windows

package provider

const (
// DockerAPIVersion is a constant holding the version of the Docker API traefik will use
DockerAPIVersion string = "1.21"
)
6 changes: 6 additions & 0 deletions provider/docker_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package provider

const (
// DockerAPIVersion is a constant holding the version of the Docker API traefik will use
DockerAPIVersion string = "1.24"
)

0 comments on commit da5eba1

Please sign in to comment.