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

Install upstream runc into /usr/bin/docker-runc #3545

Merged
merged 2 commits into from
Jan 18, 2019
Merged

Install upstream runc into /usr/bin/docker-runc #3545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d0edd
Install upstream runc into /usr/bin/docker-runc
tstromberg Jan 18, 2019
5b75065
Add remove TODO comments for docker 18.09
tstromberg Jan 18, 2019
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
5 changes: 4 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 @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/package/runc-master/runc-master.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))