Move to Ubuntu24.04 and python3.12 (#272)

Author: JohnGarbutt

Dockerfile

@@ -1,8 +1,7 @@
-FROM ubuntu:jammy as helm
+FROM ubuntu:24.04 AS helm
 
 RUN apt-get update && \
-    apt-get install -y curl && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get install -y curl wget ca-certificates
 
 ARG HELM_VERSION=v3.18.3
 RUN set -ex; \
@@ -12,15 +11,15 @@ RUN set -ex; \
         aarch64) helm_arch=arm64 ;; \
         *) false ;; \
     esac; \
-    curl -fsSL https://get.helm.sh/helm-${HELM_VERSION}-linux-${helm_arch}.tar.gz | \
+    wget -q -O - https://get.helm.sh/helm-${HELM_VERSION}-linux-${helm_arch}.tar.gz | \
       tar -xz --strip-components 1 -C /usr/bin linux-${helm_arch}/helm; \
     helm version
 
 
-FROM ubuntu:jammy AS python-builder
+FROM ubuntu:24.04 AS python-builder
 
 RUN apt-get update && \
-    apt-get install -y python3 python3-venv && \
+    apt-get install -y python3 python3-venv git && \
     rm -rf /var/lib/apt/lists/*
 
 RUN python3 -m venv /venv && \
@@ -33,13 +32,13 @@ COPY . /app
 RUN /venv/bin/pip install /app
 
 
-FROM ubuntu:jammy
+FROM ubuntu:24.04
 
 # Create the user that will be used to run the app
-ENV APP_UID 1001
-ENV APP_GID 1001
-ENV APP_USER app
-ENV APP_GROUP app
+ENV APP_UID=1001
+ENV APP_GID=1001
+ENV APP_USER=app
+ENV APP_GROUP=app
 RUN groupadd --gid $APP_GID $APP_GROUP && \
     useradd \
       --no-create-home \
@@ -50,24 +49,23 @@ RUN groupadd --gid $APP_GID $APP_GROUP && \
       $APP_USER
 
 RUN apt-get update && \
-    apt-get install -y ca-certificates python3 tini && \
+    apt-get install -y ca-certificates python3 && \
     rm -rf /var/lib/apt/lists/*
 
 # Don't buffer stdout and stderr as it breaks realtime logging
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONUNBUFFERED=1
 
 # Make httpx use the system trust roots
 # By default, this means we use the CAs from the ca-certificates package
-ENV SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
+ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
 
 # Tell Helm to use /tmp for mutable data
-ENV HELM_CACHE_HOME /tmp/helm/cache
-ENV HELM_CONFIG_HOME /tmp/helm/config
-ENV HELM_DATA_HOME /tmp/helm/data
+ENV HELM_CACHE_HOME=/tmp/helm/cache
+ENV HELM_CONFIG_HOME=/tmp/helm/config
+ENV HELM_DATA_HOME=/tmp/helm/data
 
 COPY --from=helm /usr/bin/helm /usr/bin/helm
 COPY --from=python-builder /venv /venv
 
 USER $APP_UID
-ENTRYPOINT ["tini", "-g", "--"]
-CMD ["/venv/bin/kopf", "run", "--module", "capi_addons.operator", "--all-namespaces"]
+CMD ["/venv/bin/kopf", "run", "--module", "capi_addons.operator", "--all-namespaces", "--verbose"]