1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #41067 from AkihiroSuda/fix-make-install

make install: install containerd-shim-runc-v2 + remove useless constants
This commit is contained in:
Brian Goff 2020-06-05 06:19:51 -07:00 committed by GitHub
commit 93cf69cb5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 28 deletions

View file

@ -1,14 +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_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'

View file

@ -18,19 +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_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
)