diff --git a/Makefile b/Makefile index 5d5a6fd..f529bc0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ NAME=ctop VERSION=$(shell cat VERSION) BUILD=$(shell git rev-parse --short HEAD) -LD_FLAGS="-w -X main.version=$(VERSION) -X main.build=$(BUILD)" +LD_FLAGS="-w -X main.version=$(VERSION) -X main.build=$(BUILD) -extldflags=-Wl,--allow-multiple-definition" clean: rm -rf build/ release/ diff --git a/connector/runc.go b/connector/runc.go index ec59ba8..7121333 100644 --- a/connector/runc.go +++ b/connector/runc.go @@ -218,7 +218,7 @@ func getFactory(opts RuncOpts) (libcontainer.Factory, error) { return nil, fmt.Errorf("systemd cgroup enabled, but systemd support for managing cgroups is not available") } } - return libcontainer.New(opts.root, cgroupManager, libcontainer.CriuPath("criu")) + return libcontainer.New(opts.root, cgroupManager) } func runcFailOnErr(err error) { diff --git a/glide.lock b/glide.lock index f46b1ce..7568f70 100644 --- a/glide.lock +++ b/glide.lock @@ -66,7 +66,7 @@ imports: - name: github.com/op/go-logging version: b2cb9fa56473e98db8caba80237377e83fe44db5 - name: github.com/opencontainers/runc - version: 31980a53ae7887b2c8f8715d13c3eb486c27b6cf + version: baf6536d6259209c3edfa2b22237af82942d3dfa subpackages: - libcontainer/system - libcontainer/user diff --git a/glide.yaml b/glide.yaml index 81bf5fa..260aad2 100644 --- a/glide.yaml +++ b/glide.yaml @@ -9,3 +9,5 @@ import: - package: github.com/nu7hatch/gouuid - package: github.com/op/go-logging version: ^1.0.0 +- package: github.com/opencontainers/runc + version: ^0.1.1