MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-06 20:33:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

docker: second --ldflags was overriding the first --ldflags option

Browse Source
This commit is contained in:
Krishna Srinivas
2015-11-06 23:39:26 -08:00
parent 03f185db5f
commit f77851bee0
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,5 +1,5 @@
LDFLAGS := $(shell go run buildscripts/gen-ldflags.go)
DOCKER_LDFLAGS = '-extldflags "-static"'
DOCKER_LDFLAGS := $(LDFLAGS) -extldflags "-static"
TAG := latest
all: install
@@ -55,7 +55,7 @@ test: build
@GO15VENDOREXPERIMENT=1 go test $(GOFLAGS) github.com/minio/minio/pkg...
gomake-all: build
GO15VENDOREXPERIMENT=1 go build --ldflags $(LDFLAGS) -o $(GOPATH)/bin/minio
@GO15VENDOREXPERIMENT=1 go build --ldflags '$(LDFLAGS)' -o $(GOPATH)/bin/minio
pkg-add:
@GO15VENDOREXPERIMENT=1 govendor add $(PKG)
@@ -70,7 +70,7 @@ install: gomake-all
dockerimage: install
@echo "Building docker image:" minio:$(TAG)
@GO15VENDOREXPERIMENT=1 go build --ldflags $(LDFLAGS) --ldflags $(DOCKER_LDFLAGS) -o minio.dockerimage
@GO15VENDOREXPERIMENT=1 go build --ldflags '$(DOCKER_LDFLAGS)' -o minio.dockerimage
@mkdir -p export
@docker build --rm --tag=minio:$(TAG) .
@rmdir export