From 00c098bcad105076f6ecfed11875f9ae765372e4 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 19 Sep 2023 10:22:56 -0700
Subject: [PATCH] Bump refstack to Bookworm and python3.11

Refstack doesn't rely on much in the base operating system as far as I
can tell. That said refstack seems to test with python3.10 and not 3.11
so this may not work, but our testing should give us a good idea. Bump
these things up as we are updating all the services we can in order to
eventually cleanup image builds for old debian and old python.

Change-Id: Id39027691484e8f81bd097c174f0a4a1e81463af
---
 docker/refstack/Dockerfile         | 8 ++++----
 zuul.d/docker-images/refstack.yaml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/refstack/Dockerfile b/docker/refstack/Dockerfile
index fc3e73787f..5e95e2b8cd 100644
--- a/docker/refstack/Dockerfile
+++ b/docker/refstack/Dockerfile
@@ -16,14 +16,14 @@
 # upload trigger - Thu 11 Aug 2022 16:11 PM UTC
 # refstack commit - f222f3fb9540f0df4bf0cb8736c2470740659b18
 
-FROM opendevorg/python-builder:3.9-bullseye as builder
+FROM opendevorg/python-builder:3.11-bookworm as builder
 
 RUN apt-get update \
   && apt-get -y install git apt-utils python3-dev dh-python libc-dev-bin \
      libc6-dev libexpat1-dev libpython3-dev libpython3-dev linux-libc-dev \
      apt-transport-https curl gnupg2 \
   && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo "deb https://deb.nodesource.com/node_16.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb https://deb.nodesource.com/node_18.x bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \
   && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
   && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
   && apt-get update \
@@ -47,7 +47,7 @@ RUN python -m venv /tmp/venv \
   && /tmp/venv/bin/python /tmp/src/tools/convert-docs.py -o /tmp/src/refstack-ui/app/components/about/templates /tmp/src/doc/source/*.rst \
   && rm -rf /tmp/venv
 
-FROM opendevorg/python-base:3.9-bullseye as refstack
+FROM opendevorg/python-base:3.11-bookworm as refstack
 
 COPY --from=builder /output/ /output
 COPY --from=builder /tmp/src/refstack-ui/app/ /refstack-ui/app
@@ -59,4 +59,4 @@ RUN /output/install-from-bindep \
   && rm -rf /output
 
 ENTRYPOINT ["/usr/bin/entrypoint"]
-CMD ["pecan", "serve", "/usr/local/lib/python3.9/site-packages/refstack/api/config.py"]
+CMD ["pecan", "serve", "/usr/local/lib/python3.11/site-packages/refstack/api/config.py"]
diff --git a/zuul.d/docker-images/refstack.yaml b/zuul.d/docker-images/refstack.yaml
index cd67c8a474..cf66d00dc0 100644
--- a/zuul.d/docker-images/refstack.yaml
+++ b/zuul.d/docker-images/refstack.yaml
@@ -4,8 +4,8 @@
     description: Build a refstack image.
     parent: system-config-build-image
     requires: &refstack_requires
-      - python-base-3.9-bullseye-container-image
-      - python-builder-3.9-bullseye-container-image
+      - python-base-3.11-bookworm-container-image
+      - python-builder-3.11-bookworm-container-image
     provides: refstack-container-image
     vars: &refstack_vars
       docker_images: