Skip to content

Commit

Permalink
Upgrade to Docker 17.05-ce
Browse files Browse the repository at this point in the history
This is an attempt to address kubernetes#1518.   It does actually fix kubernetes#1518, but breaks much of Kubernetes.   :)   Don't merge this, I'm just creating a PR that people can play with if they're interested in taking it further.
  • Loading branch information
bryanlarsen committed May 31, 2017
1 parent ccb0fb3 commit 0019625
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
sha256 893e3c6e89c0cd2c5f1e51ea41bc2dd97f5e791fcfa3cee28445df277836339d docker-1.11.1.tgz
md5 1058a7eb3f05833475fcc29fc4b11011 docker-17.05.0-ce.tgz
6 changes: 5 additions & 1 deletion deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

DOCKER_BIN_VERSION = 1.11.1
DOCKER_BIN_VERSION = 17.05.0-ce
DOCKER_BIN_SITE = https://get.docker.com/builds/Linux/x86_64
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz

Expand Down Expand Up @@ -32,6 +32,10 @@ define DOCKER_BIN_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 \
$(@D)/docker-containerd-ctr \
$(TARGET_DIR)/bin/docker-containerd-ctr

$(INSTALL) -D -m 0755 \
$(@D)/dockerd \
$(TARGET_DIR)/bin/dockerd
endef

define DOCKER_BIN_INSTALL_INIT_SYSTEMD
Expand Down
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/docker-bin/docker.service
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Environment=DOCKER_RAMDISK=yes
# the default is not to use systemd for cgroups because the delegate issues still
# exists and systemd currently does not support the cgroup feature set required
# for containers run by docker
ExecStart=/usr/bin/docker daemon -H fd://
ExecStart=/usr/bin/dockerd -H fd://
ExecReload=/bin/kill -s HUP $MAINPID
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
Expand Down

0 comments on commit 0019625

Please sign in to comment.