From 1cdcdc99ae087a3be209197896a07944ff0d46ce Mon Sep 17 00:00:00 2001
From: Benjamin Yolken <benjamin.yolken@segment.com>
Date: Tue, 9 Jun 2020 16:59:27 -0700
Subject: [PATCH 1/2] Ignore .git in images

---
 .dockerignore    |  3 +++
 Dockerfile       |  5 ++++-
 Makefile         | 13 ++++++++-----
 Makefile.release |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..f7fc72ab
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+.git
+.github
+.circleci
diff --git a/Dockerfile b/Dockerfile
index b903db0c..95961a21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,11 @@ FROM golang:1.13-alpine AS build
 WORKDIR /go/src/github.com/segmentio/chamber
 COPY . .
 
+ARG VERSION
+RUN test -n "${VERSION}"
+
 RUN apk add -U make git
-RUN make linux
+RUN make linux VERSION=${VERSION}
 
 FROM scratch AS run
 
diff --git a/Makefile b/Makefile
index 7741a24b..de887542 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,14 @@
 #
 # This makefile is meant for humans
 
-VERSION := $(shell git describe --tags --always --dirty="-dev")
-VERSION_NO_V := $(shell git describe --tags --always --dirty="-dev" | sed 's/^v//')
-VERSION_MAJOR_MINOR_PATCH := $(shell git describe --tags --always --dirty="-dev" | sed 's/^v\([0-9]*.[0-9]*.[0-9]*\).*/\1/')
-VERSION_MAJOR_MINOR := $(shell git describe --tags --always --dirty="-dev" | sed 's/^v\([0-9]*.[0-9]*\).*/\1/')
-VERSION_MAJOR := $(shell git describe --tags --always --dirty="-dev" | sed 's/^v\([0-9]*\).*/\1/')
+ifndef VERSION
+	VERSION := $(shell git describe --tags --always --dirty="-dev")
+endif
+
+VERSION_NO_V := $(shell echo "$(VERSION)" | sed 's/^v//')
+VERSION_MAJOR_MINOR_PATCH := $(shell echo "$(VERSION)" | sed 's/^v\([0-9]*.[0-9]*.[0-9]*\).*/\1/')
+VERSION_MAJOR_MINOR := $(shell echo "$(VERSION)" | sed 's/^v\([0-9]*.[0-9]*\).*/\1/')
+VERSION_MAJOR := $(shell echo "$(VERSION)" | sed 's/^v\([0-9]*\).*/\1/')
 ANALYTICS_WRITE_KEY ?=
 LDFLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.AnalyticsWriteKey=$(ANALYTICS_WRITE_KEY)"'
 
diff --git a/Makefile.release b/Makefile.release
index c8a89f73..27f0066a 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -127,6 +127,7 @@ publish-dockerhub:
 		-t segment/chamber:$(DOCKERHUB_TAG_PREFIX)$(VERSION_MAJOR_MINOR) \
 		-t segment/chamber:$(DOCKERHUB_TAG_PREFIX)$(VERSION_MAJOR) \
 		-t segment/chamber:$(DOCKERHUB_TAG_PREFIX)$(VERSION_NO_V) \
+		--build-arg VERSION=$(VERSION) \
 		.
 	docker push segment/chamber:$(DOCKERHUB_TAG_PREFIX)$(VERSION_MAJOR_MINOR_PATCH)
 	docker push segment/chamber:$(DOCKERHUB_TAG_PREFIX)$(VERSION_MAJOR_MINOR)

From 5523fa45a51cdf4315bc1e4f83246ec57ce96412 Mon Sep 17 00:00:00 2001
From: Nick Irvine <nick@segment.com>
Date: Wed, 10 Jun 2020 14:55:42 -0700
Subject: [PATCH 2/2] Dockerfile rm git

Co-authored-by: Jeremy Jackins <jeremyjackins@gmail.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 95961a21..bfe60f51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 ARG VERSION
 RUN test -n "${VERSION}"
 
-RUN apk add -U make git
+RUN apk add -U make
 RUN make linux VERSION=${VERSION}
 
 FROM scratch AS run