update build ldflags to permit multiple runc dep versions

This commit is contained in:
Bradley Cicenas 2017-06-09 18:18:11 +00:00
parent e8d9f3327c
commit 4dbc5653ff
4 changed files with 5 additions and 3 deletions

View File

@ -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/

View File

@ -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) {

2
glide.lock generated
View File

@ -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

View File

@ -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