Merge pull request #33 from seatgeek/docker-hub-versioning

Go 1.14 and version awarness

Author: burdandrei

Dockerfile

@@ -1,8 +1,11 @@
 # Build layer
-FROM golang:1.13 AS builder
+FROM golang:1.14 AS builder
 WORKDIR /go/src/github.com/seatgeek/resec
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o build/resec  .
+ARG RESEC_VERSION
+ENV RESEC_VERSION ${RESEC_VERSION:-local-dev}
+RUN echo $RESEC_VERSION
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X 'main.Version=${RESEC_VERSION}'" -a -installsuffix cgo -o build/resec  .
 
 # Run layer
 FROM alpine:latest

hooks/build

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ $DOCKER_TAG == "latest" ]
+then
+  docker build . --build-arg RESEC_VERSION=${SOURCE_BRANCH} -t ${IMAGE_NAME}
+else
+  docker build . --build-arg RESEC_VERSION=${DOCKER_TAG} -t ${IMAGE_NAME}
+fi

main.go

@@ -34,7 +34,7 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:   "consul-lock-key",
-			Usage:  "KV lock location, should be overriden if multiple instances running in the same consul DC",
+			Usage:  "KV lock location, should be overridden if multiple instances running in the same consul DC",
 			Value:  "resec/.lock",
 			EnvVar: "CONSUL_LOCK_KEY",
 		},
@@ -139,6 +139,8 @@ func main() {
 		default:
 			log.Fatalf("Invalid log format '%s', please use on of [text, json, gelf]", c.String("log-format"))
 		}
+
+		log.Infof("Starting ReSeC %s", Version)
 		return nil
 	}
 	app.Action = func(c *cli.Context) error {