From 584728ec0d40b2b717729ea77382dbf28e76c52c Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sat, 5 Jun 2021 22:55:58 +0200
Subject: [PATCH] Update Golang to 1.13.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .circleci/config.yml | 2 +-
 Dockerfile           | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ab18ff408..467f61e2ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       # Needed to install go
       OS: linux
       ARCH: amd64
-      GOVERSION: 1.12
+      GOVERSION: 1.13
       # Needed to install protoc
       PROTOC_VERSION: 3.6.1
 
diff --git a/Dockerfile b/Dockerfile
index 6d795a468b..58dc21e720 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,10 @@
 # NOTE(dperny): for some reason, alpine was giving me trouble
-FROM golang:1.12.9-stretch
+ARG GO_VERSION=1.13.15
+ARG DEBIAN_FRONTEND=noninteractive
+ARG BASE_DEBIAN_DISTRO="buster"
+ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
+
+FROM ${GOLANG_IMAGE}
 
 RUN apt-get update && apt-get install -y make git unzip