Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static builds in go1.4 #3666

Merged
merged 1 commit into from
Jan 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/hello-kubernetes/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
set -e
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
2 changes: 1 addition & 1 deletion cluster/addons/dns/kube2sky/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: kube2sky

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
sudo docker build -t kubernetes/kube2sky .
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/dns/skydns/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: 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
sudo docker build -t kubernetes/skydns .
Expand Down
2 changes: 1 addition & 1 deletion contrib/for-demos/serve_hostname/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: serve_hostname

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
sudo docker build -t kubernetes/serve_hostname .
Expand Down
2 changes: 1 addition & 1 deletion contrib/for-demos/test-webserver/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: push

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
sudo docker build -t kubernetes/test-webserver .
Expand Down
2 changes: 1 addition & 1 deletion contrib/for-tests/network-tester/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: push

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
sudo docker build -t kubernetes/nettest .
Expand Down
2 changes: 1 addition & 1 deletion examples/liveness/image/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: push

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
docker build -t kubernetes/liveness .
Expand Down