From 9204c47af7b04eadff6677db70909663b55ed56b Mon Sep 17 00:00:00 2001
From: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:30:31 -0400
Subject: [PATCH] docker-dev: add go version as build arg (#10117)

---
 Makefile                     | 6 +++---
 scripts/docker/Dockerfile    | 6 +++---
 scripts/docker/Dockerfile.ui | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a77ef54206..80c92b678a 100644
--- a/Makefile
+++ b/Makefile
@@ -51,12 +51,12 @@ dev-dynamic-mem: BUILD_TAGS+=memprofiler
 dev-dynamic-mem: dev-dynamic
 
 # Creates a Docker image by adding the compiled linux/amd64 binary found in ./bin.
-# The resulting image is tagged "vault:dev". 
+# The resulting image is tagged "vault:dev".
 docker-dev: prep
-	docker build -f scripts/docker/Dockerfile -t vault:dev .
+	docker build --build-arg VERSION=$(GO_VERSION_MIN) -f scripts/docker/Dockerfile -t vault:dev .
 
 docker-dev-ui: prep
-	docker build -f scripts/docker/Dockerfile.ui -t vault:dev-ui .
+	docker build --build-arg VERSION=$(GO_VERSION_MIN) -f scripts/docker/Dockerfile.ui -t vault:dev-ui .
 
 # test runs the unit tests and vets the code
 test: prep
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index f511b9a093..427ae1f3a7 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,7 +1,7 @@
-# Multi-stage builder to avoid polluting users environment with wrong 
-# architecture binaries.  Since this binary is used in an alpine container, 
+# Multi-stage builder to avoid polluting users environment with wrong
+# architecture binaries.  Since this binary is used in an alpine container,
 # we're explicitly compiling for 'linux/amd64'
-ARG VERSION=1.13.10
+ARG VERSION=1.14.7
 
 FROM golang:${VERSION} AS builder
 
diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui
index 299d581a73..e23debc427 100644
--- a/scripts/docker/Dockerfile.ui
+++ b/scripts/docker/Dockerfile.ui
@@ -3,7 +3,7 @@
 # we're explicitly compiling for 'linux/amd64'
 FROM debian:buster AS builder
 
-ARG VERSION=1.13.10
+ARG VERSION=1.14.7
 ARG CGO_ENABLED=0
 ARG BUILD_TAGS
 ENV JOBS=2