From 4f17f48871701f7f6dc9038c18c407aacb4c105e Mon Sep 17 00:00:00 2001 From: dungeonmaster18 Date: Sat, 20 Jan 2018 01:50:33 +0530 Subject: [PATCH] Addressed comments. Signed-off-by: dungeonmaster18 --- Dockerfile | 8 ++++++-- cmd/version.go | 6 +----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c80d184..ac299ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,15 @@ FROM golang:1.9.2 as build -MAINTAINER alexellis2@gmail.com +LABEL maintainer alexellis2@gmail.com RUN mkdir -p /go/src/github.com/alexellis/jaas WORKDIR /go/src/github.com/alexellis/jaas -COPY . . +COPY .git .git +COPY cmd cmd +COPY vendor vendor +COPY version version +COPY main.go . RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \ && GIT_COMMIT=$(git rev-list -1 HEAD) \ diff --git a/cmd/version.go b/cmd/version.go index f220e1e..13c4872 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -5,7 +5,6 @@ package cmd import ( "fmt" - "runtime" "github.com/alexellis/jaas/version" "github.com/morikuni/aec" @@ -40,10 +39,7 @@ func runVersion(cmd *cobra.Command, args []string) { if shortVersion { fmt.Println(version.BuildVersion()) } else { - figletColoured := aec.BlueF.Apply(figletStr) - if runtime.GOOS == "windows" { - figletColoured = aec.GreenF.Apply(figletStr) - } + figletColoured := aec.GreenF.Apply(figletStr) fmt.Printf(figletColoured) fmt.Printf("Commit: %s\n", version.GitCommit) fmt.Printf("Version: %s\n", version.BuildVersion())