From a64f976794e25915564f64c8a1e2231a84866d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 12 Dec 2024 22:34:25 +0100 Subject: [PATCH] Invalidate layer cache when deadsnake ppa changes --- Dockerfile-12.0 | 2 ++ Dockerfile-13.0 | 2 ++ Dockerfile-14.0 | 2 ++ Dockerfile-15.0 | 2 ++ Dockerfile-16.0 | 1 + Dockerfile-17.0 | 2 ++ Dockerfile-18.0 | 2 ++ 7 files changed, 13 insertions(+) diff --git a/Dockerfile-12.0 b/Dockerfile-12.0 index 47c2a0d..bcdba6d 100644 --- a/Dockerfile-12.0 +++ b/Dockerfile-12.0 @@ -4,6 +4,7 @@ FROM docker.io/ubuntu:$DISTRO LABEL org.opencontainers.image.authors="ACSONE SA/NV" +ARG DISTRO ARG PYTHONBIN=python3.6 ENV \ @@ -15,6 +16,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/ RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \ diff --git a/Dockerfile-13.0 b/Dockerfile-13.0 index 922330c..c866efe 100644 --- a/Dockerfile-13.0 +++ b/Dockerfile-13.0 @@ -4,6 +4,7 @@ FROM docker.io/ubuntu:$DISTRO LABEL org.opencontainers.image.authors="ACSONE SA/NV" +ARG DISTRO ARG PYTHONBIN=python3.6 ENV \ @@ -15,6 +16,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/ RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \ diff --git a/Dockerfile-14.0 b/Dockerfile-14.0 index 40bdecc..d9359b6 100644 --- a/Dockerfile-14.0 +++ b/Dockerfile-14.0 @@ -4,6 +4,7 @@ FROM docker.io/ubuntu:$DISTRO LABEL org.opencontainers.image.authors="ACSONE SA/NV" +ARG DISTRO ARG PYTHONBIN=python3.6 ENV \ @@ -15,6 +16,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/ RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \ diff --git a/Dockerfile-15.0 b/Dockerfile-15.0 index 439a969..69f6fc8 100644 --- a/Dockerfile-15.0 +++ b/Dockerfile-15.0 @@ -4,6 +4,7 @@ FROM docker.io/ubuntu:$DISTRO LABEL org.opencontainers.image.authors="ACSONE SA/NV" +ARG DISTRO ARG PYTHONBIN=python3.8 ENV \ @@ -15,6 +16,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/ RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \ diff --git a/Dockerfile-16.0 b/Dockerfile-16.0 index 487a64a..61f01f6 100644 --- a/Dockerfile-16.0 +++ b/Dockerfile-16.0 @@ -15,6 +15,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/ RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \ diff --git a/Dockerfile-17.0 b/Dockerfile-17.0 index 5d9d3ab..6cc3bf6 100644 --- a/Dockerfile-17.0 +++ b/Dockerfile-17.0 @@ -4,6 +4,7 @@ FROM docker.io/ubuntu:$DISTRO LABEL org.opencontainers.image.authors="ACSONE SA/NV" +ARG DISTRO ARG PYTHONBIN=python3.11 ENV \ @@ -15,6 +16,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/deadsnakes RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \ diff --git a/Dockerfile-18.0 b/Dockerfile-18.0 index 2ef760c..858046e 100644 --- a/Dockerfile-18.0 +++ b/Dockerfile-18.0 @@ -4,6 +4,7 @@ FROM docker.io/ubuntu:$DISTRO LABEL org.opencontainers.image.authors="ACSONE SA/NV" +ARG DISTRO ARG PYTHONBIN=python3.12 ENV \ @@ -15,6 +16,7 @@ ENV \ KWKHTMLTOPDF_SERVER_URL=http://kwkhtmltopdf +ADD https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu/dists/$DISTRO/Release /tmp/ RUN --mount=type=bind,source=./install,target=/tmp/install \ set -x \ && /tmp/install/pre-install.sh \