A few updates.

- Update the base image for most images.
- Remove the Cloudposse repo for the k8s image. All of the tools are now
  available in the Alpine repos.
- Use the toolbx image as the base image for the python3 image.
- Use the python3 image as the base for the pre-commit image.

.gitlab-ci.yml

@@ -110,6 +110,8 @@ push-k8s:
 # pre-commit image:
 
 build-pre-commit:
+  needs:
+    - push-python3
   extends: .container-build
   variables:
     CONTEXT: images/pre-commit

images/bats/Dockerfile

-FROM registry.hub.docker.com/library/alpine:3.18
+FROM registry.hub.docker.com/library/alpine:3.21
 # hadolint ignore=DL3018
 RUN apk add --update --no-cache \
         bats \

images/docker/Dockerfile

-FROM docker.io/docker:24.0-cli
+FROM docker.io/docker:28.0-cli
 # hadolint ignore=DL3018
 RUN apk add --update-cache --no-cache \
         buildah \

images/hugo/Dockerfile

-FROM registry.hub.docker.com/library/alpine:3.18
+FROM registry.hub.docker.com/library/alpine:3.21
 # hadolint ignore=DL3018
 RUN apk add --no-cache --update hugo && \
     hugo version

images/k8s/Dockerfile

-FROM docker.io/library/alpine:3.18
+FROM docker.io/library/alpine:3.21
 # hadolint ignore=DL3018
-RUN wget -q https://apk.cloudposse.com/ops@cloudposse.com.rsa.pub -O /etc/apk/keys/ops@cloudposse.com.rsa.pub && \
-    echo "https://apk.cloudposse.com/3.15/vendor" >> /etc/apk/repositories && \
+RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.21/community' >> /etc/apk/repositories && \
     apk add --update --no-cache \
         docker-cli \
         helm \

images/pre-commit/Dockerfile

 # hadolint ignore=DL3007
-FROM registry.shore.co.il/toolbx:latest
+FROM registry.shore.co.il/ci-images:python3
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3008,DL3013
 RUN apt-get update && \
@@ -7,18 +7,9 @@ RUN apt-get update && \
         docker-ce-cli \
         docker-compose-plugin \
         git \
-        python3-dev \
-        python3-pip \
-        python3-setuptools \
-        python3-venv \
     && \
     ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose && \
-    export PIP_CONSTRAINT=/tmp/constraint.txt && \
-    echo 'Cython < 3.0' > "$PIP_CONSTRAINT" && \
-    python3 -m pip install --no-cache-dir --break-system-packages \
-        pipenv \
-        poetry \
+    python3 -m pip install --no-cache-dir \
         pre_commit \
-        tox \
     && \
     rm -rf /root/.cache /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*

images/python3/Dockerfile

-FROM buildpack-deps:bookworm
+# hadolint ignore=DL3007
+FROM registry.shore.co.il/toolbx:latest
 # hadolint ignore=DL3008,DL3013
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        build-essential \
         python3-dev \
         python3-pip \
         python3-venv \
     && \
-    python3 -m pip install --progress-bar=off --no-cache-dir --upgrade --break-system-packages \
+    rm /usr/lib/python*/EXTERNALLY-MANAGED && \
+    python3 -m pip install --progress-bar=off --no-cache-dir --upgrade \
         pipenv \
         poetry \
         tox \