Przeglądaj źródła

hack: remove useless constants

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Akihiro Suda 5 lat temu
rodzic
commit
2befe194af
2 zmienionych plików z 14 dodań i 30 usunięć
  1. 0 15
      hack/make/.binary-setup
  2. 14 15
      hack/make/install-binary

+ 0 - 15
hack/make/.binary-setup

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

+ 14 - 15
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
 )