Browse Source

Switch to building runc-v1

pull/824/head
Darren Shepherd 5 years ago
parent
commit
26342e42ca
  1. 7
      scripts/build
  2. 2
      vendor.go

7
scripts/build

@ -42,6 +42,7 @@ rm -f \
bin/cni \
bin/runc \
bin/containerd-shim \
bin/containerd-shim-runc-v1 \
bin/k3s-server \
bin/kubectl \
bin/crictl \
@ -67,6 +68,6 @@ CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o bin/cni ./cm
echo Building runc
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
echo Building containerd-shim
make -C ./vendor/github.com/containerd/containerd bin/containerd-shim
cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim ./bin/containerd-shim
echo Building containerd-shim-runc-v1
make -C ./vendor/github.com/containerd/containerd bin/containerd-shim-runc-v1
cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim-runc-v1 ./bin/containerd-shim-runc-v1

2
vendor.go

@ -3,7 +3,7 @@
package main
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/go-bindata/go-bindata"
_ "github.com/go-bindata/go-bindata/go-bindata"

Loading…
Cancel
Save