Skip to content

Commit

Permalink
Merge pull request #15 from CajuM/PR-static
Browse files Browse the repository at this point in the history
Add static build support
  • Loading branch information
hallyn authored Jul 3, 2019
2 parents 05a9543 + b3153fe commit caf9042
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 213 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*~
crio-lxc
crio-lxc-test*
oci/
roots/
.stacker/
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ TEST?=$(patsubst test/%.bats,%,$(wildcard test/*.bats))
CRIO_REPO?=~/packages/cri-o

crio-lxc: $(GO_SRC)
go build -ldflags "-X main.version=$(COMMIT)" -o crio-lxc ./cmd
go build -tags static_build -ldflags "-X main.version=$(COMMIT)" -o crio-lxc ./cmd

.PHONY: foreign
foreign: $(GO_SRC)
stacker build --substitute PWD=$$PWD

# make test TEST=basic will run only the basic test.
.PHONY: check
Expand All @@ -20,4 +24,5 @@ vendorup:

.PHONY: clean
clean:
-rm -r crio-lxc
-rm -f crio-lxc
stacker clean --all
27 changes: 11 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
module github.com/lxc/crio-lxc

require (
github.com/anuvu/stacker v0.4.0
github.com/apex/log v1.1.0
github.com/gorilla/websocket v1.4.0 // indirect
github.com/juju/loggo v0.0.0-20190212223446-d976af380377 // indirect
github.com/lxc/lxd v0.0.0-20190404234020-f51c28a37443
github.com/openSUSE/umoci v0.4.4
github.com/apex/log v1.1.1
github.com/aws/aws-sdk-go v1.20.8 // indirect
github.com/golang/protobuf v1.3.1 // indirect
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/opencontainers/runtime-spec v1.0.1
github.com/opencontainers/selinux v1.2.1 // indirect
github.com/pkg/errors v0.8.1
github.com/rogpeppe/godef v1.1.1 // indirect
github.com/sirupsen/logrus v1.4.1 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/urfave/cli v1.20.0
golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5 // indirect
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 // indirect
golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67
golang.org/x/tools v0.0.0-20190405180640-052fc3cfdbc2 // indirect
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0
golang.org/x/text v0.3.2 // indirect
golang.org/x/tools v0.0.0-20190625160430-252024b82959 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/lxc/go-lxc.v2 v2.0.0-20190324192716-2f350e4a2980
gopkg.in/yaml.v2 v2.2.2
k8s.io/client-go v11.0.0+incompatible // indirect
gopkg.in/lxc/go-lxc.v2 v2.0.0-20190625173123-f4822c6bba64
gopkg.in/yaml.v2 v2.2.2 // indirect
)

replace github.com/vbatts/go-mtree v0.4.4 => github.com/vbatts/go-mtree v0.4.5-0.20190122034725-8b6de6073c1a
Expand Down
Loading

0 comments on commit caf9042

Please sign in to comment.