Merge pull request #1497 from pi-hole/alpine3_19

Update alpine to 3.19

src/Dockerfile

@@ -1,5 +1,5 @@
-ARG CONTAINER="3.18"
-FROM alpine:${CONTAINER}
+ARG alpine_version="3.19"
+FROM alpine:${alpine_version}
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 
 ARG TARGETPLATFORM

test/Dockerfile

@@ -1,16 +1,19 @@
-FROM docker:24.0.4-cli-alpine3.18
+ARG alpine_version="3.19"
+ARG docker_version="24.0.7"
+
+FROM docker:${docker_version}-cli-alpine${alpine_version}
 
 COPY --chmod=0755 ./cmd.sh /usr/local/bin/cmd.sh
 COPY --chmod=0755 ./entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY Pipfile* /root/
+COPY requirements.txt /root/
 WORKDIR /root
 
 RUN apk add --no-cache \
     python3-dev \
     py3-pip \
     curl \
-    && pip3 install --no-cache-dir -U pip pipenv \
-    && pipenv install --system \
+    && pip3 install --break-system-packages --no-cache-dir -U pip  \
+    && pip3 install --break-system-packages --no-cache-dir -r requirements.txt \
     # Not 100% sure what this line does, but it's always been in the Dockerfile (aside from pointing at a different file)
     # Tests fall over without it. Investigate later.
     && sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.11/site-packages/testinfra/backend/docker.py