Merge pull request #3666 from thockin/golang-static

Fix static builds in go1.4
This commit is contained in:
Joe Beda 2015-01-21 10:07:41 -08:00
commit d20b9d4567
7 changed files with 7 additions and 7 deletions

View File

@ -17,4 +17,4 @@
set -e set -e
set -x set -x
CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static" -s' hello.go CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags '-extldflags "-static" -s' hello.go

View File

@ -1,7 +1,7 @@
all: kube2sky all: kube2sky
kube2sky: kube2sky.go kube2sky: kube2sky.go
CGO_ENABLED=0 go build -a --ldflags '-w' ./kube2sky.go CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./kube2sky.go
container: kube2sky container: kube2sky
sudo docker build -t kubernetes/kube2sky . sudo docker build -t kubernetes/kube2sky .

View File

@ -1,7 +1,7 @@
all: skydns all: skydns
skydns: skydns:
CGO_ENABLED=0 go build -a --ldflags '-w' github.com/skynetservices/skydns CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' github.com/skynetservices/skydns
container: skydns container: skydns
sudo docker build -t kubernetes/skydns . sudo docker build -t kubernetes/skydns .

View File

@ -3,7 +3,7 @@ all: serve_hostname
TAG = 1.0 TAG = 1.0
serve_hostname: serve_hostname.go serve_hostname: serve_hostname.go
CGO_ENABLED=0 go build -a --ldflags '-w' ./serve_hostname.go CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go
container: serve_hostname container: serve_hostname
sudo docker build -t kubernetes/serve_hostname:$(TAG) . sudo docker build -t kubernetes/serve_hostname:$(TAG) .

View File

@ -1,7 +1,7 @@
all: push all: push
test-webserver: test-webserver.go test-webserver: test-webserver.go
CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./test-webserver.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./test-webserver.go
container: test-webserver container: test-webserver
sudo docker build -t kubernetes/test-webserver . sudo docker build -t kubernetes/test-webserver .

View File

@ -1,7 +1,7 @@
all: push all: push
webserver: webserver.go webserver: webserver.go
CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./webserver.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go
container: webserver container: webserver
sudo docker build -t kubernetes/nettest . sudo docker build -t kubernetes/nettest .

View File

@ -1,7 +1,7 @@
all: push all: push
server: server.go server: server.go
CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w' ./server.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go
container: server container: server
docker build -t kubernetes/liveness . docker build -t kubernetes/liveness .