public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 20:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

runc: v1.0.0-rc94 (#3305)

Browse Source 
- bump the runc version to v1.0.0-rc94
- build runc from its own source tree instead of from ./vendor/
  - side-steps incompatibility with upstream kubelet container manager

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
This commit is contained in:
Jacob Blain Christen
2021-05-12 11:50:24 -07:00
committed by GitHub
parent e10524a6b1
commit 0d05b14b71
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build
View File

@@ -117,9 +117,9 @@ ln -s containerd ./bin/ctr
# echo Building containerd
# CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/
echo Building runc
rm -f ./vendor/github.com/opencontainers/runc/runc
make EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./vendor/github.com/opencontainers/runc $RUNC_STATIC
cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc
rm -f ./build/src/github.com/opencontainers/runc/runc
make GOPATH=$(pwd)/build EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./build/src/github.com/opencontainers/runc $RUNC_STATIC
cp -f ./build/src/github.com/opencontainers/runc/runc ./bin/runc
echo Building containerd-shim
rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim