Update Dockerfile and add build-docker.sh script

go-ignite · Apr 20, 2018 · c736d6b · c736d6b
1 parent 2ab1cdf
commit c736d6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,8 @@
 FROM golang:1.9 as builder
+ARG VERSION
 WORKDIR /go/src/github.com/go-ignite/ignite
 COPY . .
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o ignite .
+RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=${VERSION}" -o ignite .
 
 
 FROM alpine
@@ -22,4 +23,4 @@ COPY --from=builder /go/src/github.com/go-ignite/ignite/conf ./conf
 RUN mv ./conf/config-temp.toml ./conf/config.toml
 
 EXPOSE 5000
-CMD ["/bin/sh", "-c", "./ignite"]
+ENTRYPOINT ["./ignite"]
diff --git a/build-dokcer.sh b/build-dokcer.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+docker build --build-arg VERSION=`git describe` -t goignite/ignite .
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#! /bin/bash
		docker build --build-arg VERSION=`git describe` -t goignite/ignite .