something weird and wrong with ubuntu docker image, I am done trying …

…to figure it out
awslabs · Jan 11, 2024 · 62e673e · 62e673e
1 parent 10efcb7
commit 62e673e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/.github/docker-images/ubuntu-18-x64/Dockerfile b/.github/docker-images/ubuntu-18-x64/Dockerfile
@@ -24,6 +24,12 @@ RUN apt-get update -qq \
     ca-certificates \
     && apt-get clean
 
+# Add the longsleep/golang-backports PPA
+RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository ppa:longsleep/golang-backports && apt-get update
+
+# Install Go from the PPA
+RUN apt-get install -y golang-go
+
 ###############################################################################
 # Python/AWS CLI
 ###############################################################################

diff --git a/.github/docker-images/ubuntu-20-x64/Dockerfile b/.github/docker-images/ubuntu-20-x64/Dockerfile
@@ -20,6 +20,12 @@ RUN apt-get update -qq \
     ca-certificates \
     && apt-get clean
 
+# Add the longsleep/golang-backports PPA
+RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository ppa:longsleep/golang-backports && apt-get update
+
+# Install Go from the PPA
+RUN apt-get install -y golang-go
+
 ###############################################################################
 # Python/AWS CLI
 ###############################################################################

diff --git a/.github/docker-images/ubuntu-22-x64/Dockerfile b/.github/docker-images/ubuntu-22-x64/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update -qq \
     software-properties-common \
     apt-transport-https \
     ca-certificates \
+    golang-go \
     && apt-get clean
 
 ###############################################################################

diff --git a/builder/imports/golang.py b/builder/imports/golang.py
@@ -13,7 +13,7 @@
     'linux-armv7': 'https://go.dev/dl/go1.21.5.linux-armv6l.tar.gz',
     'linux-armv8': 'https://go.dev/dl/go1.21.5.linux-arm64.tar.gz',
     'linux-x86': 'https://go.dev/dl/go1.21.5.linux-386.tar.gz',
-    'linux-x64': 'https://go.dev/dl/go1.20.13.linux-amd64.tar.gz',
+    'linux-x64': 'https://go.dev/dl/go1.21.5.linux-amd64.tar.gz',
     'openbsd-x64': 'https://go.dev/dl/go1.21.5.linux-amd64.tar.gz',
     'windows-x64': 'https://go.dev/dl/go1.21.5.windows-amd64.zip',
     'windows-x86': 'https://go.dev/dl/go1.21.5.windows-386.zip',