Merge pull request #39 from paulwilljones/bin-version-for-docker

Add Make install target to facilitate version info in Docker

Author: jetstack-bot

Dockerfile

@@ -12,7 +12,7 @@ RUN go mod download
 
 ## Bring in everything else and build an amd64 image
 COPY . .
-RUN GOOS=linux GOARCH=amd64 go install .
+RUN make install
 
 # STAGE 2
 # Use a distroless nonroot base image for just our executable

Makefile

@@ -4,6 +4,8 @@ VERSION:=$(shell $(ROOT_DIR)/hack/getversion)
 COMMIT:=$(shell git rev-list -1 HEAD)
 DATE:=$(shell date -uR)
 GOVERSION:=$(shell go version | awk '{print $$3 " " $$4}')
+GOOS:=$(shell go env GOOS)
+GOARCH:=$(shell go env GOARCH)
 
 DOCKER_IMAGE?=quay.io/jetstack/preflight
 DOCKER_IMAGE_TAG?=$(DOCKER_IMAGE):$(VERSION)
@@ -17,6 +19,7 @@ define LDFLAGS
 endef
 
 GO_BUILD:=go build -ldflags '$(LDFLAGS)'
+GO_INSTALL:=go install -ldflags '$(LDFLAGS)'
 
 export GO111MODULE=on
 
@@ -30,6 +33,9 @@ clean:
 build:
 	cd $(ROOT_DIR) && $(GO_BUILD) -o builds/preflight .
 
+install:
+	cd $(ROOT_DIR) && $(GO_INSTALL)
+
 test:
 	cd $(ROOT_DIR) && go test ./...
 

go.sum

@@ -251,6 +251,7 @@ github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/flux v0.13.0/go.mod h1:81jeDcHVn1rN5uj9aQ81S72Q8ol8If7N0zM0G8TnxTE=
 github.com/influxdata/influxdb v1.7.2/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=