Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to building runc-v1

Browse Source
This commit is contained in:
Darren Shepherd 2019-09-19 21:15:51 -07:00
parent f208c9a563
commit 26342e42ca
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/build
View File

@ -42,6 +42,7 @@ rm -f \
bin/cni \ bin/cni \
bin/runc \ bin/runc \
bin/containerd-shim \ bin/containerd-shim \
bin/containerd-shim-runc-v1 \
bin/k3s-server \ bin/k3s-server \
bin/kubectl \ bin/kubectl \
bin/crictl \ bin/crictl \
@ -67,6 +68,6 @@ CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o bin/cni ./cm
echo Building runc echo Building runc
make EXTRA_LDFLAGS="-w -s" BUILDTAGS="apparmor seccomp" -C ./vendor/github.com/opencontainers/runc static make EXTRA_LDFLAGS="-w -s" BUILDTAGS="apparmor seccomp" -C ./vendor/github.com/opencontainers/runc static
cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc
echo Building containerd-shim echo Building containerd-shim-runc-v1
make -C ./vendor/github.com/containerd/containerd bin/containerd-shim make -C ./vendor/github.com/containerd/containerd bin/containerd-shim-runc-v1
cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim ./bin/containerd-shim cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim-runc-v1 ./bin/containerd-shim-runc-v1

2
vendor.go
View File

@ -3,7 +3,7 @@
package main package main
import ( import (
_ "github.com/containerd/containerd/cmd/containerd-shim" _ "github.com/containerd/containerd/cmd/containerd-shim-runc-v1"
_ "github.com/coreos/go-systemd/activation" _ "github.com/coreos/go-systemd/activation"
_ "github.com/go-bindata/go-bindata" _ "github.com/go-bindata/go-bindata"
_ "github.com/go-bindata/go-bindata/go-bindata" _ "github.com/go-bindata/go-bindata/go-bindata"