From 28d0edda80dc1ddb1fee7b3fd2c3c5e3bb9e2bb8 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 18 Jan 2019 08:07:23 -0800 Subject: [PATCH 1/2] Install upstream runc into /usr/bin/docker-runc --- deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk | 3 ++- deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 48a2dbb5b0..37f4ed8bd7 100644 --- a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk @@ -25,9 +25,10 @@ define DOCKER_BIN_INSTALL_TARGET_CMDS $(@D)/docker-containerd \ $(TARGET_DIR)/bin/docker-containerd + # As of 2019-01, we use upstream runc so that we may update it independently of docker. $(INSTALL) -D -m 0755 \ $(@D)/docker-runc \ - $(TARGET_DIR)/bin/docker-runc + $(TARGET_DIR)/bin/docker-runc.orig $(INSTALL) -D -m 0755 \ $(@D)/docker-containerd-ctr \ 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 c4f3e11736..17e6776d69 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -47,6 +47,8 @@ endef define RUNC_MASTER_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc + # Install the binary in the location where Docker expects it, so that we can keep runc releases in sync. + ln $(@D)/bin/runc $(TARGET_DIR)/usr/bin/docker-runc endef $(eval $(generic-package)) From 5b7506574dfa3c734ad30727439afcdf7a3314d9 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 18 Jan 2019 09:09:51 -0800 Subject: [PATCH 2/2] Add remove TODO comments for docker 18.09 --- deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk | 2 ++ 1 file changed, 2 insertions(+) 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 37f4ed8bd7..ee6f223f2e 100644 --- a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk @@ -21,11 +21,13 @@ define DOCKER_BIN_INSTALL_TARGET_CMDS $(@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-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