From 000d2b92a138bff5ae079bf90862fe4077dccd3f Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 6 Nov 2019 11:32:59 -0800
Subject: [PATCH] Add GOLANG_VERSION arg support to proxy-docker make target +
 Dockerfile (#1430)

* Add GOLANG_VERSION arg to proxy-docker

* Set default GOLANG_VERSION to 1.13 in Makefile

* Add note in proxy Dockerfile re: GOLANG_VERSION

* Add GOLANG_VERSION to docker-compose dev target
---
 Makefile             | 5 +++--
 cmd/proxy/Dockerfile | 8 ++++++--
 docker-compose.yml   | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 28fed0e0..7043a8e8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION = "unset"
 DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)
 
 ifndef GOLANG_VERSION
-override GOLANG_VERSION = 1.12
+override GOLANG_VERSION = 1.13
 endif
 
 .PHONY: build
@@ -24,6 +24,7 @@ run: ## run the athens proxy with dev configs
 
 .PHONY: run-docker
 run-docker:
+	docker-compose -p athensdockerdev build --build-arg GOLANG_VERSION=${GOLANG_VERSION} dev
 	docker-compose -p athensdockerdev up -d dev
 
 .PHONY: run-docker-teardown
@@ -71,7 +72,7 @@ docker: proxy-docker
 
 .PHONY: proxy-docker
 proxy-docker:
-	docker build -t gomods/athens -f cmd/proxy/Dockerfile .
+	docker build -t gomods/athens -f cmd/proxy/Dockerfile --build-arg GOLANG_VERSION=${GOLANG_VERSION} .
 
 .PHONY: docker-push
 docker-push:
diff --git a/cmd/proxy/Dockerfile b/cmd/proxy/Dockerfile
index faa37381..ff4de3bf 100644
--- a/cmd/proxy/Dockerfile
+++ b/cmd/proxy/Dockerfile
@@ -1,8 +1,12 @@
 # Links to compare against to ensure we have all VCS's setup in this build
 # https://github.com/docker-library/buildpack-deps/blob/1845b3f918f69b4c97912b0d4d68a5658458e84f/stretch/scm/Dockerfile
 # https://github.com/golang/go/blob/f082dbfd4f23b0c95ee1de5c2b091dad2ff6d930/src/cmd/go/internal/get/vcs.go#L90
-
-FROM golang:1.13-alpine AS builder
+#
+# You can override the Go version used to build the image.
+# See project Makefile if using make.
+# See docker --build-arg if building directly.
+ARG GOLANG_VERSION=1.13
+FROM golang:${GOLANG_VERSION}-alpine AS builder
 
 WORKDIR $GOPATH/src/github.com/gomods/athens
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 57f2ab2f..8b04efcb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,8 @@ services:
     build:
       context: .
       dockerfile: cmd/proxy/Dockerfile
+      args:
+        GOLANG_VERSION: 1.13
     environment:
       - ATHENS_MONGO_STORAGE_URL=mongodb://mongo:27017
       - TIMEOUT=20 # in case the mongo dependency takes longer to start up