kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3545 from tstromberg/runc-update 

Install upstream runc into /usr/bin/docker-runc
pull/3549/head
Thomas Strömberg 2019-01-18 13:42:55 -08:00 committed by GitHub
parent 28f3e74b41 5b7506574d
commit 227d560417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
View File

@ -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 \

2
deploy/iso/minikube-iso/package/runc-master/runc-master.mk
View File

@ -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))