scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated Dockerfile to use go 1.8 and ldflags; removed pilosactl stuff from Makefile, send ldflags to build container.

Browse source
This commit is contained in:
Yuce Tekol 2017-03-09 11:14:01 +03:00
parent d61c825812
commit a446d7b9e6
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile
View file

@ -1,7 +1,9 @@
FROM golang:1.7.5
FROM golang:1.8.0
MAINTAINER Pilosa Corp. <dev@pilosa.com>
ARG ldflags=''
EXPOSE 15000
VOLUME /data
@ -20,7 +22,8 @@ COPY . /go/src/github.com/pilosa/pilosa
RUN cd /go/src/github.com/pilosa/pilosa \
&& make vendor \
&& CGO_ENABLED=0 go install -a github.com/pilosa/pilosa/cmd/pilosa
&& CGO_ENABLED=0 go install -a -ldflags "$ldflags" github.com/pilosa/pilosa/cmd/pilosa \
&& rm -rf /go/src /go/pkg
ENTRYPOINT ["/go/bin/pilosa"]
CMD ["-config", "/config"]
CMD ["server", "--config", "/config"]

13
Makefile
View file

@ -1,4 +1,4 @@
.PHONY: glide vendor-update docker pilosa pilosactl crossbuild install generate
.PHONY: glide vendor-update docker pilosa crossbuild install generate
GLIDE := $(shell command -v glide 2>/dev/null)
PROTOC := $(shell command -v protoc 2>/dev/null)
@ -8,7 +8,7 @@ CLONE_URL=github.com/pilosa/pilosa
BUILD_TIME=`date -u +%FT%T%z`
LDFLAGS=-ldflags "-X main.Version=$(VERSION) -X main.BuildTime=$(BUILD_TIME)"
default: test pilosa pilosactl
default: test pilosa
$(GOPATH)/bin:
mkdir $(GOPATH)/bin
@ -32,17 +32,12 @@ test: vendor
pilosa: vendor
go build $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosa
pilosactl: vendor
go build $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosactl
crossbuild: vendor
mkdir -p build/pilosa-$(IDENTIFIER)
make pilosa FLAGS="-o build/pilosa-$(IDENTIFIER)/pilosa"
make pilosactl FLAGS="-o build/pilosa-$(IDENTIFIER)/pilosactl"
install: vendor
go install $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosa
go install $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosactl
.protoc-gen-gofast: vendor
ifndef PROTOC
@ -55,4 +50,6 @@ generate: .protoc-gen-gofast
go generate github.com/pilosa/pilosa/internal
docker:
docker build -t pilosa:latest .
docker build -t "pilosa:$(VERSION)" \
--build-arg ldflags="-X main.Version=$(VERSION) -X main.BuildTime=$(BUILD_TIME)" .
@echo "Created image: pilosa:$(VERSION)"