Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Docker to 1.12.6. #1658

Merged
merged 1 commit into from
Jun 29, 2017
Merged

Upgrade Docker to 1.12.6. #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sha256 893e3c6e89c0cd2c5f1e51ea41bc2dd97f5e791fcfa3cee28445df277836339d docker-1.11.1.tgz
sha256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd docker-1.12.6.tgz
10 changes: 9 additions & 1 deletion deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
View file
Open in desktop
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 = 1.12.6
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,14 @@ 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

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

define DOCKER_BIN_INSTALL_INIT_SYSTEMD
Expand Down
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/docker-bin/docker.service
View file
Open in desktop
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