build(ct): move configbaker to Ubuntu 24.04 LTS

- Align image with the foundation of our usual app images. Enables reusing existing scripts to detect updates.
- Move away from pinning all package versions. This won't work for most package systems, as older releases are only kept temporarily. We simply need to rely on detecting updates to them.
- As Ubuntu Noble has no packages for awscli or wait4x, install them manually.
- As awscli requires Python, install that and a rather lightweight package manager pipx.
- Add SHELL specification to avoid any problems

Author: poikilotherm

modules/container-configbaker/Dockerfile

@@ -10,50 +10,61 @@ ARG SOLR_VERSION
 FROM solr:${SOLR_VERSION} AS solr
 
 # Let's build ourselves a baker
-FROM alpine:3.21
+FROM ubuntu:24.04
 
 ENV SCRIPT_DIR="/scripts" \
     SECRETS_DIR="/secrets" \
     SOLR_TEMPLATE="/template"
 ENV PATH="${PATH}:${SCRIPT_DIR}" \
     BOOTSTRAP_DIR="${SCRIPT_DIR}/bootstrap"
 
-# renovate: datasource=repology depName=alpine_3_21/aws-cli
-ENV AWS_CLI_VERSION="2.22.10-r0"
-# renovate: datasource=repology depName=alpine_3_21/bash
-ENV BASH_VERSION="5.2.37-r0"
-# renovate: datasource=repology depName=alpine_3_21/bind-tools
-ENV BIND_TOOLS_VERSION="9.18.36-r0"
-# renovate: datasource=repology depName=alpine_3_21/curl
-ENV CURL_VERSION="8.12.1-r1"
-# renovate: datasource=repology depName=alpine_3_21/dumb-init
-ENV DUMB_INIT_VERSION="1.2.5-r3"
-# renovate: datasource=repology depName=alpine_3_21/ed
-ENV ED_VERSION="1.20.2-r0"
-# renovate: datasource=repology depName=alpine_3_21/jq
-ENV JQ_VERSION="1.7.1-r0"
-# renovate: datasource=repology depName=alpine_3_21/netcat-openbsd
-ENV NETCAT_VERSION="1.226.1.1-r0"
-# renovate: datasource=repology depName=alpine_3_21/postgresql17-client
-ENV PGCLIENT17_VERSION="17.5-r0"
-# renovate: datasource=repology depName=alpine_3_21/wait4x
-ENV WAIT4X_VERSION="2.14.0-r9"
+ARG PKGS="curl dnsutils dumb-init ed jq netcat-openbsd postgresql-client"
+# renovate: datasource=github-releases depName=wait4x/wait4x
+ARG WAIT4X_VERSION="v3.3.0"
+# renovate: datasource=pypi depName=awscli
+ARG AWSCLI_VERSION="1.40.15"
+ARG PYTHON_PKGS="awscli==${AWSCLI_VERSION}"
+
+# Auto-populated by BuildKit / buildx
+ARG TARGETARCH
+SHELL ["/bin/bash", "-eu", "-c"]
 
 RUN true && \
-  # Install necessary software and tools
-  apk add --no-cache \
-    aws-cli=${AWS_CLI_VERSION} \
-    bind-tools=${BIND_TOOLS_VERSION} \
-    bash=${BASH_VERSION} \
-    curl=${CURL_VERSION} \
-    dumb-init=${DUMB_INIT_VERSION} \
-    ed=${ED_VERSION} \
-    jq=${JQ_VERSION} \
-    netcat-openbsd=${NETCAT_VERSION} \
-    postgresql17-client=${PGCLIENT17_VERSION} \
-    wait4x=${WAIT4X_VERSION} && \
   # Make our working directories
-  mkdir -p ${SCRIPT_DIR} ${SECRETS_DIR} ${SOLR_TEMPLATE}
+  mkdir -p ${SCRIPT_DIR} ${SECRETS_DIR} ${SOLR_TEMPLATE} && \
+
+  # Install packages
+  apt-get update -q && \
+  apt-get install -qqy --no-install-recommends ${PKGS} && \
+
+  # Workaround to install Python and pipx 1.5+ on Ubuntu 24.04 LTS: first install Python and pipx 1.4 \
+  # Adapted from https://github.com/pypa/pipx/issues/1481#issuecomment-2593124603
+  apt -qqy --no-install-recommends install python3 python3-venv pipx && \
+  # Now install 1.5+ in ~/.local/bin/
+  pipx install pipx && \
+  # Remove 1.4 again
+  apt purge -qqy --autoremove pipx && \
+  # Install 1.5+ in /usr/local/bin/pipx
+  ~/.local/bin/pipx install --global pipx && \
+  # Remove the virtual env install of pipx
+  rm -rf "~/.local" && \
+
+  # Cleanup apt cache
+  rm -rf "/var/lib/apt/lists/*"
+
+# New step (and shell) as this is a different manager and we need pipx around as command
+RUN true && \
+  # Install things not available as packages \
+  ARCH="${TARGETARCH:-$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')}" && \
+
+  # 1. wait4x \
+  curl -sSfL -o /usr/bin/wait4x.tar.gz "https://github.com/wait4x/wait4x/releases/download/${WAIT4X_VERSION}/wait4x-linux-${ARCH}.tar.gz" && \
+  curl -sSfL -o /tmp/w4x-checksum "https://github.com/wait4x/wait4x/releases/download/${WAIT4X_VERSION}/wait4x-linux-${ARCH}.tar.gz.sha256sum" && \
+  echo "$(cat /tmp/w4x-checksum | cut -f1 -d" ") /usr/bin/wait4x.tar.gz" | sha256sum -c - && \
+  tar -xzf /usr/bin/wait4x.tar.gz -C /usr/bin && chmod +x /usr/bin/wait4x && \
+
+  # 2. Python packages
+  pipx install --global ${PYTHON_PKGS}
 
 # Get in the scripts 
 COPY maven/scripts maven/solr/update-fields.sh ${SCRIPT_DIR}/