From 085d3eb8f00c9a962a5f41a55abc526a94e02bbf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:50:06 +0000 Subject: [PATCH 1/4] Update docker.io/python Docker tag to v3.12.8 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a6c636b..61058788 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/python:3.11.5-slim-bullseye AS base +FROM docker.io/python:3.12.8-slim-bullseye AS base ARG TARGETARCH ENV TARGETARCH=${TARGETARCH:-amd64} From 748b64e5dc4eb6821d32470262c28ab19b7f3f1a Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Fri, 17 Jan 2025 12:04:46 +0100 Subject: [PATCH 2/4] Make Dockerfile Python minor agnostic Extract Python minor version from `PYTHON_VERSION` environment variable which is set by the python base image. --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 61058788..09fcb674 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,6 +61,8 @@ RUN ./tools/install-jb.sh v0.6.2 \ FROM base AS runtime +ENV PYTHON_MINOR="${PYTHON_VERSION%.*}" + RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ git \ @@ -72,7 +74,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && echo " ControlMaster auto\n ControlPath /tmp/%r@%h:%p" >> /etc/ssh/ssh_config COPY --from=builder \ - /usr/local/lib/python3.11/site-packages/ /usr/local/lib/python3.11/site-packages/ + /usr/local/lib/python${PYTHON_MINOR}/site-packages/ \ + /usr/local/lib/python${PYTHON_MINOR}/site-packages/ COPY --from=builder \ /usr/local/bin/kapitan* \ /usr/local/bin/commodore* \ From f2ca68ff81f17dccd2d997dadad4573b5ba7fe3f Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Fri, 17 Jan 2025 13:18:15 +0100 Subject: [PATCH 3/4] Switch to Debian bookworm Python docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09fcb674..3175cdb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/python:3.12.8-slim-bullseye AS base +FROM docker.io/python:3.12.8-slim-bookworm AS base ARG TARGETARCH ENV TARGETARCH=${TARGETARCH:-amd64} From cc25ef5e89bd7933eee4c59befbbc59273c9c3fe Mon Sep 17 00:00:00 2001 From: Simon Gerber Date: Fri, 17 Jan 2025 13:21:29 +0100 Subject: [PATCH 4/4] Actually disable Renovate for Poetry Python version --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 5a18cf56..44196590 100644 --- a/renovate.json +++ b/renovate.json @@ -53,7 +53,7 @@ }, { "matchManagers": ["poetry"], - "matchPackageNames": ["python"], + "matchDepNames": ["python"], "enabled": false } ]