From 0e604e2cf1615d754f01f394c33601046dcf472f Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <stephen.soltesz@gmail.com>
Date: Tue, 21 Mar 2023 18:10:10 +0000
Subject: [PATCH] Update golang version to 1.20 (#68)

* Update to go1.20
---
 Dockerfile              |  2 +-
 Dockerfile.epoxy-images |  8 ++++----
 Dockerfile.golang       |  2 +-
 Dockerfile.jsonnet      |  4 ++--
 Dockerfile.siteinfo     |  2 +-
 cloudbuild.yaml         | 16 ++++++++--------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 15a8181..66f9523 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.20
 
 ADD . /go/src/github.com/m-lab/gcp-config
 WORKDIR /go/src/github.com/m-lab/gcp-config/
diff --git a/Dockerfile.epoxy-images b/Dockerfile.epoxy-images
index de40b12..01003d4 100644
--- a/Dockerfile.epoxy-images
+++ b/Dockerfile.epoxy-images
@@ -9,10 +9,10 @@ RUN apt-get install -y unzip python3-pip git vim-nox make autoconf gcc mkisofs \
     linux-source xorriso jq
 
 # Fetch recent go version.
-# NOTE: As of 2022-08-31, golang-1.18 was not an available package in ubuntu:20.04
-ENV GOLANG_VERSION 1.18.5
-ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2
+# NOTE: As of 2023-03-20, golang-1.20 was not an available package in ubuntu:20.04
+ENV GOLANG_VERSION 1.20.2
+ENV GOLANG_DOWNLOAD_URL https://go.dev/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
+ENV GOLANG_DOWNLOAD_SHA256 4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
     && echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/Dockerfile.golang b/Dockerfile.golang
index 88415f7..b5269c6 100644
--- a/Dockerfile.golang
+++ b/Dockerfile.golang
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.20
 ADD . /go/src/github.com/m-lab/gcp-config
 RUN go install -v github.com/m-lab/gcp-config/cmd/cbif@v1.3.12
 ENTRYPOINT ["/go/bin/cbif"]
diff --git a/Dockerfile.jsonnet b/Dockerfile.jsonnet
index bef9f2c..b8383dc 100644
--- a/Dockerfile.jsonnet
+++ b/Dockerfile.jsonnet
@@ -1,10 +1,10 @@
 # Build cbif for entrypoint.
-FROM golang:1.18 AS cbif-go-builder
+FROM golang:1.20 AS cbif-go-builder
 ADD . /go/src/github.com/m-lab/gcp-config
 RUN go install -v github.com/m-lab/gcp-config/cmd/cbif@v1.3.12
 
 # Build Go version of jsonnet.
-FROM golang:1.18 AS jsonnet-go-builder
+FROM golang:1.20 AS jsonnet-go-builder
 RUN apt-get install -y git
 RUN go install -v github.com/google/go-jsonnet/cmd/jsonnet@latest
 
diff --git a/Dockerfile.siteinfo b/Dockerfile.siteinfo
index cb67742..73fe458 100644
--- a/Dockerfile.siteinfo
+++ b/Dockerfile.siteinfo
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.20
 RUN go install github.com/m-lab/epoxy/cmd/epoxy_admin@v1.2.5
 RUN go install github.com/m-lab/gcp-config/cmd/cbctl@v1.3.12
 RUN go install -v github.com/m-lab/gcp-config/cmd/cbif@v1.3.12
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 8c568b1..eb2b25d 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -13,7 +13,7 @@ steps:
 # Build golang-cbif container. Useful golang builds and tests.
 - name: gcr.io/cloud-builders/docker
   args: [
-    'build', '--tag=gcr.io/$PROJECT_ID/golang-cbif:1.18',
+    'build', '--tag=gcr.io/$PROJECT_ID/golang-cbif:1.20',
     '--file=Dockerfile.golang', '.'
   ]
 
@@ -21,7 +21,7 @@ steps:
 - name: gcr.io/cloud-builders/docker
   args: [
     'build',
-    '--tag=gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.0',
+    '--tag=gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.1',
     '--file=Dockerfile.jsonnet', '.'
   ]
   waitFor: ['-']
@@ -30,7 +30,7 @@ steps:
 - name: gcr.io/cloud-builders/docker
   args: [
     'build',
-    '--tag=gcr.io/$PROJECT_ID/epoxy-images:1.0',
+    '--tag=gcr.io/$PROJECT_ID/epoxy-images:1.1',
     '--file=Dockerfile.epoxy-images', '.'
   ]
   waitFor: ['-']
@@ -39,13 +39,13 @@ steps:
 - name: gcr.io/cloud-builders/docker
   args: [
     'build',
-    '--tag=gcr.io/$PROJECT_ID/siteinfo-cbif:1.0',
+    '--tag=gcr.io/$PROJECT_ID/siteinfo-cbif:1.1',
     '--file=Dockerfile.siteinfo', '.'
   ]
   waitFor: ['-']
 
 images:
-- 'gcr.io/$PROJECT_ID/golang-cbif:1.18'
-- 'gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.0'
-- 'gcr.io/$PROJECT_ID/epoxy-images:1.0'
-- 'gcr.io/$PROJECT_ID/siteinfo-cbif:1.0'
+- 'gcr.io/$PROJECT_ID/golang-cbif:1.20'
+- 'gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.1'
+- 'gcr.io/$PROJECT_ID/epoxy-images:1.1'
+- 'gcr.io/$PROJECT_ID/siteinfo-cbif:1.1'