Move to Ubuntu 24.04 and Python 3.12 (#418)

Author: bertiethorpe

.github/workflows/tox.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10','3.12']
+        python-version: ['3.12']
 
     steps:
     - name: Check out the repository

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy AS python-builder
+FROM ubuntu:24.04 AS python-builder
 
 RUN apt-get update && \
     apt-get install -y git python3 python3-venv && \
@@ -16,7 +16,7 @@ COPY . /app
 RUN /venv/bin/pip install -e /app
 
 
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 
 # Don't buffer stdout and stderr as it breaks realtime logging
 ENV PYTHONUNBUFFERED 1

api/setup.cfg

@@ -6,7 +6,7 @@ version = 0.1.0
 description = API for managing projects in an OpenStack cloud.
 long_description = file: README.md
 url = https://github.com/azimuth-cloud/azimuth
-
+python-requires= >=3.10
 
 [options]
 zip_safe = False

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.ruff]
 line-length = 88
-target-version = "py310"
+target-version = "py312"
 
 [tool.ruff.format]
 line-ending = "lf"
@@ -30,6 +30,7 @@ select = [
 ]
 ignore = [
     "UP038", # deprecated
+    "UP017", # remove and fix once 3.10 no longer tested in CI
 ]
 
 [tool.mypy]

ui/Dockerfile

@@ -15,9 +15,9 @@ RUN cd /application && \
 
 # This intermediate image is used to fetch the GPG key for the NGINX repo
 # without polluting the runtime image with GPG packages
-FROM ubuntu:jammy AS nginx-gpg-key
+FROM ubuntu:24.04 AS nginx-gpg-key
 
-ENV NGINX_GPG_KEY="573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62"
+ENV NGINX_GPG_KEY="2FD21310B49F6B46"
 
 RUN apt-get update && \
     apt-get install -y gnupg2 && \
@@ -27,7 +27,7 @@ RUN gpg2 --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=1
     gpg2 --export "$NGINX_GPG_KEY" > /usr/share/keyrings/nginx-archive-keyring.gpg
 
 
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 
 # Copy the GPG key from the intermediate container
 COPY --from=nginx-gpg-key /usr/share/keyrings/nginx-archive-keyring.gpg /usr/share/keyrings/
@@ -45,11 +45,11 @@ COPY --from=nginx-gpg-key /usr/share/keyrings/nginx-archive-keyring.gpg /usr/sha
 #      but we don't want to make all of /var/run writable
 RUN echo "Target NGINX version: ${NGINX_VERSION}"
 RUN apt-get update && \
-    apt-get install --no-install-recommends --no-install-suggests -y ca-certificates && \
-    echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/mainline/ubuntu/ jammy nginx" \
+    apt-get install --no-install-recommends --no-install-suggests -y ca-certificates tini && \
+    echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/mainline/ubuntu/ noble nginx" \
       > /etc/apt/sources.list.d/nginx.list && \
     apt-get update && \
-    apt-get install --no-install-recommends --no-install-suggests -y "nginx=${NGINX_VERSION}*" tini && \
+    apt-get install --no-install-recommends --no-install-suggests -y "nginx=${NGINX_VERSION}*" && \
     rm -rf /var/lib/apt/lists/* && \
     ln -sf /dev/stdout /var/log/nginx/access.log && \
     ln -sf /dev/stderr /var/log/nginx/error.log && \