From f758d598c5170036fd230cadbabbf7f558114f67 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 4 Jun 2020 18:08:42 +0900 Subject: [PATCH 1/2] make install: install containerd-shim-runc-v2 Signed-off-by: Akihiro Suda --- hack/make/.binary-setup | 1 + hack/make/install-binary | 1 + 2 files changed, 2 insertions(+) diff --git a/hack/make/.binary-setup b/hack/make/.binary-setup index 44d42fa759..6e4e284d15 100644 --- a/hack/make/.binary-setup +++ b/hack/make/.binary-setup @@ -5,6 +5,7 @@ DOCKER_RUNC_BINARY_NAME='runc' DOCKER_CONTAINERD_BINARY_NAME='containerd' DOCKER_CONTAINERD_CTR_BINARY_NAME='ctr' DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim' +DOCKER_CONTAINERD_SHIM_RUNC_V2_BINARY_NAME='containerd-shim-runc-v2' DOCKER_PROXY_BINARY_NAME='docker-proxy' DOCKER_INIT_BINARY_NAME='docker-init' DOCKER_ROOTLESSKIT_BINARY_NAME='rootlesskit' diff --git a/hack/make/install-binary b/hack/make/install-binary index 1e1b107df1..04ce52e5e1 100644 --- a/hack/make/install-binary +++ b/hack/make/install-binary @@ -24,6 +24,7 @@ install_binary() { install_binary "${DEST}/${DOCKER_CONTAINERD_BINARY_NAME}" install_binary "${DEST}/${DOCKER_CONTAINERD_CTR_BINARY_NAME}" install_binary "${DEST}/${DOCKER_CONTAINERD_SHIM_BINARY_NAME}" + install_binary "${DEST}/${DOCKER_CONTAINERD_SHIM_RUNC_V2_BINARY_NAME}" install_binary "${DEST}/${DOCKER_PROXY_BINARY_NAME}" install_binary "${DEST}/${DOCKER_INIT_BINARY_NAME}" install_binary "${DEST}/${DOCKER_ROOTLESSKIT_BINARY_NAME}" From 2befe194af31d7f3bffddd2b0090957738b5858c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 5 Jun 2020 12:48:38 +0900 Subject: [PATCH 2/2] hack: remove useless constants Signed-off-by: Akihiro Suda --- hack/make/.binary-setup | 15 --------------- hack/make/install-binary | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 hack/make/.binary-setup diff --git a/hack/make/.binary-setup b/hack/make/.binary-setup deleted file mode 100644 index 6e4e284d15..0000000000 --- a/hack/make/.binary-setup +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -DOCKER_DAEMON_BINARY_NAME='dockerd' -DOCKER_RUNC_BINARY_NAME='runc' -DOCKER_CONTAINERD_BINARY_NAME='containerd' -DOCKER_CONTAINERD_CTR_BINARY_NAME='ctr' -DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim' -DOCKER_CONTAINERD_SHIM_RUNC_V2_BINARY_NAME='containerd-shim-runc-v2' -DOCKER_PROXY_BINARY_NAME='docker-proxy' -DOCKER_INIT_BINARY_NAME='docker-init' -DOCKER_ROOTLESSKIT_BINARY_NAME='rootlesskit' -DOCKER_ROOTLESSKIT_DOCKER_PROXY_BINARY_NAME='rootlesskit-docker-proxy' -DOCKER_VPNKIT_BINARY_NAME='vpnkit' -DOCKER_DAEMON_ROOTLESS_SH_BINARY_NAME='dockerd-rootless.sh' -DOCKER_DAEMON_ROOTLESS_SETUPTOOL_SH_BINARY_NAME='dockerd-rootless-setuptool.sh' diff --git a/hack/make/install-binary b/hack/make/install-binary index 04ce52e5e1..8af21b0de1 100644 --- a/hack/make/install-binary +++ b/hack/make/install-binary @@ -18,20 +18,19 @@ install_binary() { ( DEST="$(dirname $DEST)/binary-daemon" - source "${MAKEDIR}/.binary-setup" - install_binary "${DEST}/${DOCKER_DAEMON_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_RUNC_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_CONTAINERD_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_CONTAINERD_CTR_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_CONTAINERD_SHIM_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_CONTAINERD_SHIM_RUNC_V2_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_PROXY_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_INIT_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_ROOTLESSKIT_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_ROOTLESSKIT_DOCKER_PROXY_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_DAEMON_ROOTLESS_SH_BINARY_NAME}" - install_binary "${DEST}/${DOCKER_DAEMON_ROOTLESS_SETUPTOOL_SH_BINARY_NAME}" - if [ -f "${DEST}/${DOCKER_VPNKIT_BINARY_NAME}" ]; then - install_binary "${DEST}/${DOCKER_VPNKIT_BINARY_NAME}" + install_binary "${DEST}/dockerd" + install_binary "${DEST}/runc" + install_binary "${DEST}/containerd" + install_binary "${DEST}/ctr" + install_binary "${DEST}/containerd-shim" + install_binary "${DEST}/containerd-shim-runc-v2" + install_binary "${DEST}/docker-proxy" + install_binary "${DEST}/docker-init" + install_binary "${DEST}/rootlesskit" + install_binary "${DEST}/rootlesskit-docker-proxy" + install_binary "${DEST}/dockerd-rootless.sh" + install_binary "${DEST}/dockerd-rootless-setuptool.sh" + if [ -f "${DEST}/vpnkit" ]; then + install_binary "${DEST}/vpnkit" fi )