From 4eb35b3a803d77abf4e1c4e167f62f95bcaaa5b5 Mon Sep 17 00:00:00 2001
From: Jonathan Yu <jonathan@coder.com>
Date: Sat, 3 Apr 2021 17:03:47 +0000
Subject: [PATCH] chore: update golang images

* Remove unnecessary environment variables (GOROOT, GOPATH, GOBIN)
  since they have matching defaults
* Install the latest stable version of Go at image build time
---
 images/golang/Dockerfile.centos | 17 +++++++----------
 images/golang/Dockerfile.ubuntu | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/images/golang/Dockerfile.centos b/images/golang/Dockerfile.centos
index af23fec..f8a03be 100644
--- a/images/golang/Dockerfile.centos
+++ b/images/golang/Dockerfile.centos
@@ -3,16 +3,13 @@ FROM codercom/enterprise-base:centos
 # Run everything as root
 USER root
 
-# Install go1.15
-RUN curl -L "https://dl.google.com/go/go1.15.3.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
-
-# Setup go env vars
-ENV GOROOT /usr/local/go
-ENV PATH $PATH:$GOROOT/bin
-
-ENV GOPATH /home/coder/go
-ENV GOBIN $GOPATH/bin
-ENV PATH $PATH:$GOBIN
+# Install latest stable version of Go
+RUN GOVERSION="$(curl --silent --show-error --location https://golang.org/VERSION?m=text)" && \
+    curl --silent --show-error --location "https://golang.org/dl/${GOVERSION}.linux-amd64.tar.gz" | \
+      tar -C /usr/local -xzvf -
 
 # Set back to coder user
 USER coder
+
+# Ensure Go binaries are available
+ENV PATH $PATH:/usr/local/go/bin:/home/coder/go/bin
diff --git a/images/golang/Dockerfile.ubuntu b/images/golang/Dockerfile.ubuntu
index 6cf6e0a..f36e049 100644
--- a/images/golang/Dockerfile.ubuntu
+++ b/images/golang/Dockerfile.ubuntu
@@ -3,16 +3,13 @@ FROM codercom/enterprise-base:ubuntu
 # Run everything as root
 USER root
 
-# Install go1.15
-RUN curl -L "https://dl.google.com/go/go1.15.3.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
-
-# Setup go env vars
-ENV GOROOT /usr/local/go
-ENV PATH $PATH:$GOROOT/bin
-
-ENV GOPATH /home/coder/go
-ENV GOBIN $GOPATH/bin
-ENV PATH $PATH:$GOBIN
+# Install latest stable version of Go
+RUN GOVERSION="$(curl --silent --show-error --location https://golang.org/VERSION?m=text)" && \
+    curl --silent --show-error --location "https://golang.org/dl/${GOVERSION}.linux-amd64.tar.gz" | \
+      tar -C /usr/local -xzvf -
 
 # Set back to coder user
 USER coder
+
+# Ensure Go binaries are available
+ENV PATH $PATH:/usr/local/go/bin:/home/coder/go/bin