From 5927bf874dfa4e3b891110b3c3fac967ab6a0f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 4 May 2019 13:10:39 +0200 Subject: [PATCH] Upgrade Docker, from 18.06.3-ce to 18.09.5 Stop installing docker-runc, docker-containerd and docker-containerd-ctr Instead use the upstream runc, containerd and ctr (after upgrading them) runc v1.0.0-rc6-69-g2b18fe1 containerd v1.2.5 --- .../containerd-bin/containerd-bin.hash | 1 + .../package/containerd-bin/containerd-bin.mk | 4 ++-- .../package/docker-bin/docker-bin.hash | 1 + .../package/docker-bin/docker-bin.mk | 19 +++---------------- .../package/runc-master/runc-master.hash | 1 + .../package/runc-master/runc-master.mk | 4 ++-- pkg/minikube/constants/constants.go | 2 +- 7 files changed, 11 insertions(+), 21 deletions(-) diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash index 644e895357ff..9e9e0890076b 100644 --- a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash @@ -1 +1,2 @@ sha256 8565a655345f3db2f7b78b77a2cd3103895229aa44cd0e4c710ba3559e344b5a v1.2.0.tar.gz +sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 v1.2.5.tar.gz diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk index 02c3c0147951..684ef7860e25 100644 --- a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.2.0 -CONTAINERD_BIN_COMMIT = c4446665cb9c30056f4998ed953e6d4ff22c7c39 +CONTAINERD_BIN_VERSION = v1.2.5 +CONTAINERD_BIN_COMMIT = bb71b10fd8f58240ca47fbb579b9d1028eea7c84 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash index 09da6e4b9068..2ea12a8ec00a 100644 --- a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash @@ -8,3 +8,4 @@ sha256 1270dce1bd7e1838d62ae21d2505d87f16efc1d9074645571daaefdfd0c14054 docker- sha256 83be159cf0657df9e1a1a4a127d181725a982714a983b2bdcc0621244df93687 docker-18.06.1-ce.tgz sha256 a979d9a952fae474886c7588da692ee00684cb2421d2c633c7ed415948cf0b10 docker-18.06.2-ce.tgz sha256 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822 docker-18.06.3-ce.tgz +sha256 99ca9395e9c7ffbf75537de71aa828761f492491d02bc6e29db2920fa582c6c5 docker-18.09.5.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 index e1f34f8c73f0..a06acbcd7a10 100644 --- a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 18.06.3-ce +DOCKER_BIN_VERSION = 18.09.5 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz @@ -17,24 +17,11 @@ define DOCKER_BIN_INSTALL_TARGET_CMDS $(@D)/docker \ $(TARGET_DIR)/bin/docker - $(INSTALL) -D -m 0755 \ - $(@D)/docker-containerd-shim \ - $(TARGET_DIR)/bin/docker-containerd-shim - - # TODO(tstromberg): Remove once we can upgrade to docker 18.09, which can call standard containerd. - $(INSTALL) -D -m 0755 \ - $(@D)/docker-containerd \ - $(TARGET_DIR)/bin/docker-containerd + # As of 2019-05, we use upstream containerd so that we may update it independently of docker. # As of 2019-01, we use upstream runc so that we may update it independently of docker. - # TODO(tstromberg): Remove once we can upgrade to docker 18.09, which can call standard runc. - $(INSTALL) -D -m 0755 \ - $(@D)/docker-runc \ - $(TARGET_DIR)/bin/docker-runc.orig - $(INSTALL) -D -m 0755 \ - $(@D)/docker-containerd-ctr \ - $(TARGET_DIR)/bin/docker-containerd-ctr + # As of 2019-05, we use upstream ctr so that we may update it independently of docker. $(INSTALL) -D -m 0755 \ $(@D)/dockerd \ diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 0094b71e837e..ca6ffa2d1080 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -3,3 +3,4 @@ sha256 fc780966c4d70c275a87930e93cda4210e63a490eabfb0fa5f2fe70be6dcdc58 0fdc908b sha256 9318fa9de6e3b2c89760f08d73bf718c97c93d683611716e024d2f3283c96d90 c1e454b2a1bfb0f0ebd9e621a1433f98f9a8d4b0.tar.gz sha256 a960decadf6bd5d3cee1ca7b94455d37cc921c964061428bd9f3dd17a13c8bb3 6635b4f0c6af3810594d2770f662f34ddc15b40d.tar.gz sha256 ad41ae930059fef18de1926cd78e00474c89290248fecdcc0e431c8aefee1deb 0a012df867a2d525f62a146d8ebdf2e6ab8a5ad5.tar.gz +sha256 e52c5d7365b2b9048f977bac8f06bf626dccb4d816d0947ec8523f543272f4ff 2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index e9e0ec053789..d6cfd9d68455 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -# HEAD as of 2019-02-13 -RUNC_MASTER_VERSION = 0a012df867a2d525f62a146d8ebdf2e6ab8a5ad5 +# HEAD as of 2019-03-07 +RUNC_MASTER_VERSION = 2b18fe1d885ee5083ef9f0838fee39b62d653e30 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 2a0c8d3615e1..d730b35ddceb 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -183,7 +183,7 @@ func GetProfileFile(profile string) string { } // DockerAPIVersion is the API version implemented by Docker running in the minikube VM. -const DockerAPIVersion = "1.35" +const DockerAPIVersion = "1.39" // ReportingURL is the URL for reporting a minikube error const ReportingURL = "https://clouderrorreporting.googleapis.com/v1beta1/projects/k8s-minikube/events:report?key=AIzaSyACUwzG0dEPcl-eOgpDKnyKoUFgHdfoFuA"