From 526501db0571aa8a0a5f124e278a8a9461996c12 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 18 Oct 2023 13:34:37 -0700
Subject: [PATCH] Make bookworm the python Dockerfile parent default image

This was still set to bullseye which isn't a problem for our Zuul jobs
as they always specify what version to use. However, local builds would
build bullseye by default which isn't super useful now that the vast
majority of images are built on top of bookworm. Swap things around to
avoid potential confusion.

Change-Id: If68e32a358268a423e35e44e3150115cd1da6f8c
---
 docker/python-base/Dockerfile    | 2 +-
 docker/python-builder/Dockerfile | 2 +-
 docker/uwsgi-base/Dockerfile     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/python-base/Dockerfile b/docker/python-base/Dockerfile
index ff27a2ea17..3c0d205cce 100644
--- a/docker/python-base/Dockerfile
+++ b/docker/python-base/Dockerfile
@@ -16,7 +16,7 @@
 # Comment to force rebuilds Wed Oct  4 03:32:07 PM UTC 2023
 
 ARG PYTHON_VERSION=3.11
-ARG DEBIAN_VERSION=bullseye
+ARG DEBIAN_VERSION=bookworm
 ARG IMAGE_FLAVOR=slim-
 FROM docker.io/library/python:${PYTHON_VERSION}-${IMAGE_FLAVOR}${DEBIAN_VERSION}
 # Necessary to use this var in the RUN below
diff --git a/docker/python-builder/Dockerfile b/docker/python-builder/Dockerfile
index 1a29a7ad34..825278fd40 100644
--- a/docker/python-builder/Dockerfile
+++ b/docker/python-builder/Dockerfile
@@ -16,7 +16,7 @@
 # Comment to force rebuilds Wed Oct  4 03:32:07 PM UTC 2023
 
 ARG PYTHON_VERSION=3.11
-ARG DEBIAN_VERSION=bullseye
+ARG DEBIAN_VERSION=bookworm
 FROM docker.io/library/python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} as fake-python
 
 WORKDIR /tmp
diff --git a/docker/uwsgi-base/Dockerfile b/docker/uwsgi-base/Dockerfile
index 2d28247b6a..3ae2945768 100644
--- a/docker/uwsgi-base/Dockerfile
+++ b/docker/uwsgi-base/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 ARG PYTHON_VERSION=3.11
-ARG DEBIAN_VERSION=bullseye
+ARG DEBIAN_VERSION=bookworm
 FROM docker.io/opendevorg/python-builder:${PYTHON_VERSION}-${DEBIAN_VERSION} as builder
 
 ARG PYTHON_VERSION