From 00e6e76757597ca35973d0384dde2f4fcead0c11 Mon Sep 17 00:00:00 2001
From: Deepthi Reddy <reddydn@amazon.com>
Date: Mon, 16 Dec 2024 19:10:28 +0000
Subject: [PATCH] Updated the Go 1.18 version used by tls-with-acm walkthrough

---
 walkthroughs/tls-with-acm/src/colorteller/Dockerfile | 8 ++++----
 walkthroughs/tls-with-acm/src/colorteller/deploy.sh  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/walkthroughs/tls-with-acm/src/colorteller/Dockerfile b/walkthroughs/tls-with-acm/src/colorteller/Dockerfile
index c24fc09b..3530287e 100644
--- a/walkthroughs/tls-with-acm/src/colorteller/Dockerfile
+++ b/walkthroughs/tls-with-acm/src/colorteller/Dockerfile
@@ -4,8 +4,8 @@ RUN yum update -y && \
     yum clean all && \
     rm -rf /var/cache/yum
 
-RUN curl -LO https://golang.org/dl/go1.17.1.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzvf go1.17.1.linux-amd64.tar.gz
+RUN curl -LO https://golang.org/dl/go1.18.1.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzvf go1.18.1.linux-amd64.tar.gz
 
 ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GOPATH="${HOME}/go"
@@ -17,9 +17,9 @@ COPY Gopkg.toml Gopkg.lock ./
 COPY . ./
 
 # Use the default go proxy
-ARG GO_PROXY=https://proxy.golang.org
+ARG GO_PROXY=https://goproxy.io
 ENV GOPROXY=$GO_PROXY
-RUN go mod tidy
+RUN go mod tidy -go=1.16 && go mod tidy -go=1.17
 RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -a -installsuffix nocgo -o /app .
 
 FROM scratch
diff --git a/walkthroughs/tls-with-acm/src/colorteller/deploy.sh b/walkthroughs/tls-with-acm/src/colorteller/deploy.sh
index ea8a2138..49af2f79 100755
--- a/walkthroughs/tls-with-acm/src/colorteller/deploy.sh
+++ b/walkthroughs/tls-with-acm/src/colorteller/deploy.sh
@@ -35,6 +35,6 @@ ecr_login() {
 }
 
 # build and push
-docker build -t $IMAGE $DIR --build-arg GO_PROXY=${GO_PROXY:-"https://proxy.golang.org"}
+docker build -t $IMAGE $DIR --build-arg GO_PROXY=${GO_PROXY:-"https://goproxy.io"}
 ecr_login
 docker push $IMAGE