github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Windows CNI install script using lowercase "destdir"

Browse Source 
Fixes packaging via GH Actions script, which sets DESTDIR and is used
across many scripts.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes 2020-10-02 16:31:28 -04:00
parent e3aa6a39c8
commit 615af428a3
No known key found for this signature in database
GPG Key ID: 0F386284C03A1162
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/setup/install-cni-windows
View File

@ -16,8 +16,8 @@
set -eu -o pipefail set -eu -o pipefail
destdir="${destdir:-"C:\\Program Files\\containerd"}" DESTDIR="${DESTDIR:-"C:\\Program Files\\containerd"}"
WINCNI_BIN_DIR="${destdir}/cni" WINCNI_BIN_DIR="${DESTDIR}/cni"
WINCNI_PKG=github.com/Microsoft/windows-container-networking WINCNI_PKG=github.com/Microsoft/windows-container-networking
WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2 WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2
@ -29,7 +29,7 @@ install -D -m 755 "out/nat.exe" "${WINCNI_BIN_DIR}/nat.exe"
install -D -m 755 "out/sdnbridge.exe" "${WINCNI_BIN_DIR}/sdnbridge.exe" install -D -m 755 "out/sdnbridge.exe" "${WINCNI_BIN_DIR}/sdnbridge.exe"
install -D -m 755 "out/sdnoverlay.exe" "${WINCNI_BIN_DIR}/sdnoverlay.exe" install -D -m 755 "out/sdnoverlay.exe" "${WINCNI_BIN_DIR}/sdnoverlay.exe"
CNI_CONFIG_DIR="${destdir}/cni/conf" CNI_CONFIG_DIR="${DESTDIR}/cni/conf"
mkdir -p "${CNI_CONFIG_DIR}" mkdir -p "${CNI_CONFIG_DIR}"
# split_ip splits ip into a 4-element array. # split_ip splits ip into a 4-element array.