From 75cf4e34c4f08c8528e8b65ab11e7db25f7ba1cb Mon Sep 17 00:00:00 2001
From: Doug Beatty <doug.beatty@dbtlabs.com>
Date: Tue, 11 Jul 2023 14:52:18 -0600
Subject: [PATCH 1/2] Use Ubuntu 22.04.2 LTS (Jammy Jellyfish) since it is a
 long-term supported release

---
 Dockerfile.test | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 788157a769a..a168be8b497 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -3,13 +3,13 @@
 #  See `/docker` for a generic and production-ready docker file
 ##
 
-FROM ubuntu:23.10
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-    software-properties-common \
+    software-properties-common gpg-agent \
     && add-apt-repository ppa:git-core/ppa -y \
     && apt-get dist-upgrade -y \
     && apt-get install -y --no-install-recommends \
@@ -30,8 +30,8 @@ RUN apt-get update \
     unixodbc-dev \
     && add-apt-repository ppa:deadsnakes/ppa \
     && apt-get install -y \
-    python \
-    python-dev \
+    python-is-python3 \
+    python-dev-is-python3 \
     python3-pip \
     python3.8 \
     python3.8-dev \

From 3a6216c5117b3c2b6208da40ff428d285f86cab8 Mon Sep 17 00:00:00 2001
From: Doug Beatty <doug.beatty@dbtlabs.com>
Date: Tue, 11 Jul 2023 14:54:48 -0600
Subject: [PATCH 2/2] Changelog entry

---
 .changes/unreleased/Fixes-20230711-145311.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changes/unreleased/Fixes-20230711-145311.yaml

diff --git a/.changes/unreleased/Fixes-20230711-145311.yaml b/.changes/unreleased/Fixes-20230711-145311.yaml
new file mode 100644
index 00000000000..a5bd26dd2fd
--- /dev/null
+++ b/.changes/unreleased/Fixes-20230711-145311.yaml
@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix Dockerfile.test
+time: 2023-07-11T14:53:11.454863-06:00
+custom:
+  Author: dbeatty10
+  Issue: "7352"