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

Merge pull request #4599 from estesp/fix-script-var

Browse Source 
Windows CNI install script using lowercase "destdir"
This commit is contained in:
Derek McGowan 2020-10-03 10:24:12 -07:00 committed by GitHub
commit d852786705
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
destdir="${destdir:-"C:\\Program Files\\containerd"}"
WINCNI_BIN_DIR="${destdir}/cni"
DESTDIR="${DESTDIR:-"C:\\Program Files\\containerd"}"
WINCNI_BIN_DIR="${DESTDIR}/cni"
WINCNI_PKG=github.com/Microsoft/windows-container-networking
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/sdnoverlay.exe" "${WINCNI_BIN_DIR}/sdnoverlay.exe"
CNI_CONFIG_DIR="${destdir}/cni/conf"
CNI_CONFIG_DIR="${DESTDIR}/cni/conf"
mkdir -p "${CNI_CONFIG_DIR}"
# split_ip splits ip into a 4-element array.