Merge pull request #3545 from tstromberg/runc-update

Install upstream runc into /usr/bin/docker-runc
kubernetes · Jan 18, 2019 · 227d560 · 227d560
2 parents 28f3e74 + 5b75065
commit 227d560
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -21,13 +21,16 @@ 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
+		$(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
@@ -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))