Skip to content

Commit

Permalink
Updated Dockerfile to set the version for build and updated the versi…
Browse files Browse the repository at this point in the history
…on to 0.5.1-beta.1
  • Loading branch information
brandonvfx committed Jul 13, 2017
1 parent 107b58b commit 8a85f05
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN go-wrapper download
#CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o app .
ENV CGO_ENABLED 0
ENV GOOS linux
RUN go-wrapper install -a -installsuffix cgo
RUN go-wrapper install -ldflags "-X main.Version=`./script/version`" -a -installsuffix cgo

CMD ["go-wrapper", "run"]
# FROM scratch
Expand Down
2 changes: 1 addition & 1 deletion script/version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

version="$(git describe --tags HEAD 2>/dev/null || true)"
version="$(git describe --tags --abbrev=0 HEAD 2>/dev/null || true)"

if [ -z "$version" ]; then
version="$(cat version)"
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.0-beta.1
0.5.1-beta.1

0 comments on commit 8a85f05

Please sign in to comment.