From 9c2609995ae6fd5cc824a1c8c9355d3ad771f50b Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Fri, 4 Aug 2017 14:10:23 +0100
Subject: [PATCH] close #186

Former-commit-id: 14c5044db7c81c03f27c4dbf0e7c9ba3a89cb03a [formerly 7d0fe81767e4b33c64ae7da7dd684ca8f30539c4] [formerly 815bd3a5d9770e79527de56e8d6b5d79f34cb291 [formerly 1234ee32e40adb9abc277dac8bce83988090125d]]
Former-commit-id: 2330876399f0e325dc554a08de2513b385e39a7a [formerly 638d4627e6418da2d4ebba046735bd39e8e63ae2]
Former-commit-id: d1569f07397e7f31c164080326a3a91724999778
---
 Dockerfile              | 3 ++-
 cmd/filemanager/main.go | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 91383d60..90f5fb95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,8 @@ RUN apk add --no-cache git
 RUN go get ./...
 
 WORKDIR /go/src/github.com/hacdias/filemanager/cmd/filemanager
-RUN go install
+RUN go build -ldflags "-X main.version=$(git tag -l --points-at HEAD)"
+RUN mv filemanager /go/bin/filemanager
 
 FROM alpine:latest
 COPY --from=0 /go/bin/filemanager /usr/local/bin/filemanager
diff --git a/cmd/filemanager/main.go b/cmd/filemanager/main.go
index 149ef844..65748d5e 100644
--- a/cmd/filemanager/main.go
+++ b/cmd/filemanager/main.go
@@ -87,10 +87,13 @@ func setupViper() {
 }
 
 func printVersion() {
+	version = strings.TrimSpace(version)
+
 	if version == "" {
 		fmt.Println("filemanager is at an untracked version")
 	} else {
-		fmt.Println("filemanager", version)
+		version = strings.TrimPrefix(version, "v")
+		fmt.Println("filemanager version", version)
 	}
 
 	os.Exit(0)