From eb1d382848b25215cfa007fa477d99d7c97ad884 Mon Sep 17 00:00:00 2001
From: Atharva Rane <atharvar@uchicago.edu>
Date: Wed, 2 Aug 2023 11:58:39 -0400
Subject: [PATCH 1/3] install go binary in jenkins CI worker

---
 .secrets.baseline                           | 4 ++--
 Docker/jenkins/Jenkins-CI-Worker/Dockerfile | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 8e671afaa..3a85be64f 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-07-31T16:54:24Z",
+  "generated_at": "2023-08-02T15:58:02Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -78,7 +78,7 @@
       {
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_verified": false,
-        "line_number": 115,
+        "line_number": 119,
         "type": "Secret Keyword"
       }
     ],
diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
index 671cd2e02..e76f9dcd9 100644
--- a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
+++ b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
@@ -54,6 +54,10 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" \
           google-cloud-sdk-cbt \
           kubectl
 
+# installing go binary
+COPY --from=golang:1.13-alpine /usr/local/go/ /usr/local/go/ 
+ENV PATH="/usr/local/go/bin:${PATH}"
+
 #
 # install docker tools:
 #

From f2a8f1a3896253fdf0a5b0e73200975f397187d3 Mon Sep 17 00:00:00 2001
From: Hara Prasad Juvvala <haraprasadj@uchicago.edu>
Date: Thu, 10 Aug 2023 10:44:19 -0700
Subject: [PATCH 2/3] install go

---
 .secrets.baseline                           | 4 ++--
 Docker/jenkins/Jenkins-CI-Worker/Dockerfile | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 3a85be64f..5d6f38321 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-08-02T15:58:02Z",
+  "generated_at": "2023-08-10T17:44:09Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -78,7 +78,7 @@
       {
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_verified": false,
-        "line_number": 119,
+        "line_number": 121,
         "type": "Secret Keyword"
       }
     ],
diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
index e76f9dcd9..d1d2d6641 100644
--- a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
+++ b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
@@ -54,9 +54,11 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" \
           google-cloud-sdk-cbt \
           kubectl
 
-# installing go binary
-COPY --from=golang:1.13-alpine /usr/local/go/ /usr/local/go/ 
-ENV PATH="/usr/local/go/bin:${PATH}"
+# install go - https://go.dev/doc/install
+RUN rm -rf /usr/local/go \
+    && tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
+ENV PATH="$PATH:/usr/local/go/bin"
+RUN go version
 
 #
 # install docker tools:

From 2768e0bd4ccc92344158e422597bdcbddd21b46b Mon Sep 17 00:00:00 2001
From: Hara Prasad Juvvala <haraprasadj@uchicago.edu>
Date: Thu, 10 Aug 2023 10:51:13 -0700
Subject: [PATCH 3/3] download go tar

---
 .secrets.baseline                           | 4 ++--
 Docker/jenkins/Jenkins-CI-Worker/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 5d6f38321..527ffcc30 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-08-10T17:44:09Z",
+  "generated_at": "2023-08-10T17:51:06Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -78,7 +78,7 @@
       {
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_verified": false,
-        "line_number": 121,
+        "line_number": 122,
         "type": "Secret Keyword"
       }
     ],
diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
index d1d2d6641..40fd08fa3 100644
--- a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
+++ b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
@@ -55,7 +55,8 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" \
           kubectl
 
 # install go - https://go.dev/doc/install
-RUN rm -rf /usr/local/go \
+RUN wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz \
+    && rm -rf /usr/local/go \
     && tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
 ENV PATH="$PATH:/usr/local/go/bin"
 RUN go version