Merge pull request #1542 from bryanlarsen/docker-17.05

Upgrade to Docker 17.06-ce
kubernetes · Oct 19, 2017 · 57e091d · 57e091d
2 parents ecb7a29 + c7f0344
commit 57e091d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
@@ -1 +1,3 @@
+sha256 893e3c6e89c0cd2c5f1e51ea41bc2dd97f5e791fcfa3cee28445df277836339d  docker-1.11.1.tgz
 sha256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd  docker-1.12.6.tgz
+sha256 e582486c9db0f4229deba9f8517145f8af6c5fae7a1243e6b07876bd3e706620  docker-17.06.0-ce.tgz
diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 1.12.6
-DOCKER_BIN_SITE = https://get.docker.com/builds/Linux/x86_64
+DOCKER_BIN_VERSION = 17.06.0-ce
+DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
 
 define DOCKER_BIN_USERS
@@ -46,6 +46,10 @@ define DOCKER_BIN_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 \
 		$(BR2_EXTERNAL)/package/docker-bin/docker.socket \
 		$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
+
+	$(INSTALL) -D -m 644 \
+		$(BR2_EXTERNAL_MINIKUBE_PATH)/package/docker-bin/forward.conf \
+		$(TARGET_DIR)/etc/sysctl.d/forward.conf
 endef
 
 $(eval $(generic-package))
diff --git a/deploy/iso/minikube-iso/package/docker-bin/forward.conf b/deploy/iso/minikube-iso/package/docker-bin/forward.conf
@@ -0,0 +1,2 @@
+net.ipv4.ip_forward=1
+
diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
@@ -89,7 +89,7 @@ Environment=DOCKER_RAMDISK=yes
 # will catch this invalid input and refuse to start the service with an error like:
 #  Service has more than one ExecStart= setting, which is only allowed for Type=oneshot services.
 ExecStart=
-ExecStart=/usr/bin/docker daemon -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }}
+ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }}
 ExecReload=/bin/kill -s HUP $MAINPID
 
 # Having non-zero Limit*s causes performance problems due to accounting overhead