From c8a41d653214075ec506a97633d175bd8895b2cc Mon Sep 17 00:00:00 2001
From: Michael Graeb <graebm@amazon.com>
Date: Thu, 8 Dec 2022 09:57:11 -0800
Subject: [PATCH 1/3] deshenaniganize

---
 .github/docker-images/ubuntu-18-x64/Dockerfile | 6 +-----
 builder/core/data.py                           | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/docker-images/ubuntu-18-x64/Dockerfile b/.github/docker-images/ubuntu-18-x64/Dockerfile
index 7ca1a1de3..2a050a548 100644
--- a/.github/docker-images/ubuntu-18-x64/Dockerfile
+++ b/.github/docker-images/ubuntu-18-x64/Dockerfile
@@ -11,11 +11,7 @@ RUN apt-get update -qq \
     curl \
     sudo \
     unzip \
-    # Ubuntu18's default python3 is python3.6, which is EOL.
-    # So install python3.8 (latest version on this distro, circa Oct 2022)
-    python3.8-dev \
-    # This installs pip for all python versions on the system
-    # (there is no "python3.8-pip")
+    python3-dev \
     python3-pip \
     build-essential \
     # For PPAs
diff --git a/builder/core/data.py b/builder/core/data.py
index 9e3f74306..35ad713a3 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -133,9 +133,6 @@ class PKG_TOOLS(Enum):
         ],
         'pkg_update': 'apt-get -qq update -y',
         'pkg_install': 'apt-get -qq install -y',
-        'variables': {
-            'python': "python3.8",
-        },
     },
     'debian': {
         'os': 'linux',

From 45f3a13b557ee114f3d030ebffd3e064f48ac547 Mon Sep 17 00:00:00 2001
From: Michael Graeb <graebm@amazon.com>
Date: Thu, 8 Dec 2022 10:24:39 -0800
Subject: [PATCH 2/3] "python3" on ubuntu always

---
 .github/docker-images/ubuntu-18-x64/Dockerfile     | 6 ++++--
 .github/docker-images/ubuntu-20-aarch64/Dockerfile | 3 ++-
 .github/docker-images/ubuntu-20-x64/Dockerfile     | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/docker-images/ubuntu-18-x64/Dockerfile b/.github/docker-images/ubuntu-18-x64/Dockerfile
index 2a050a548..6350296c0 100644
--- a/.github/docker-images/ubuntu-18-x64/Dockerfile
+++ b/.github/docker-images/ubuntu-18-x64/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update -qq \
     curl \
     sudo \
     unzip \
+    # Don't bother installing a specific python version. "python3" will always
+    # refer to the default for this ubuntu release (i.e. python3.6 on ubuntu-18)
     python3-dev \
     python3-pip \
     build-essential \
@@ -25,8 +27,8 @@ RUN apt-get update -qq \
 ###############################################################################
 WORKDIR /tmp
 
-RUN python3.8 -m pip install setuptools \
-    && python3.8 -m pip install --upgrade pip \
+RUN python3 -m pip install setuptools \
+    && python3 -m pip install --upgrade pip \
     && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o awscliv2.zip \
     && unzip awscliv2.zip \
     && sudo aws/install \
diff --git a/.github/docker-images/ubuntu-20-aarch64/Dockerfile b/.github/docker-images/ubuntu-20-aarch64/Dockerfile
index 3b58b2691..14e253f3f 100644
--- a/.github/docker-images/ubuntu-20-aarch64/Dockerfile
+++ b/.github/docker-images/ubuntu-20-aarch64/Dockerfile
@@ -11,7 +11,8 @@ RUN apt-get update -qq \
     curl \
     sudo \
     unzip \
-    python3 \
+    # Don't bother installing a specific python version. "python3" will always
+    # refer to the default for this ubuntu release (i.e. python3.6 on ubuntu-18)
     python3-dev \
     python3-pip \
     build-essential \
diff --git a/.github/docker-images/ubuntu-20-x64/Dockerfile b/.github/docker-images/ubuntu-20-x64/Dockerfile
index 0fe3d1c5f..241fb0270 100644
--- a/.github/docker-images/ubuntu-20-x64/Dockerfile
+++ b/.github/docker-images/ubuntu-20-x64/Dockerfile
@@ -11,6 +11,8 @@ RUN apt-get update -qq \
     curl \
     sudo \
     unzip \
+    # Don't bother installing a specific python version. "python3" will always
+    # refer to the default for this ubuntu release (i.e. python3.6 on ubuntu-18)
     python3-dev \
     python3-pip \
     build-essential \

From a2ea3296a1e70787700da24e6a13cc10aa638edb Mon Sep 17 00:00:00 2001
From: Michael Graeb <graebm@amazon.com>
Date: Thu, 8 Dec 2022 14:46:05 -0800
Subject: [PATCH 3/3] gcc 12

---
 builder/core/data.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builder/core/data.py b/builder/core/data.py
index 35ad713a3..e6618f834 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -529,6 +529,7 @@ class PKG_TOOLS(Enum):
             '9': {},
             '10': {},
             '11': {},
+            '12': {},
         },
 
         'architectures': {