From 4b104eb377d1ca849a962e8f2fd99f8e84fc50ca Mon Sep 17 00:00:00 2001 From: Janos Miko Date: Fri, 29 Dec 2023 15:48:10 +0100 Subject: [PATCH] merge repos --- images/ansible/debian/Dockerfile | 2 +- images/aws/debian/Dockerfile | 2 +- images/extended/debian/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ansible/debian/Dockerfile b/images/ansible/debian/Dockerfile index 0bbb5fa..d6d6a4e 100644 --- a/images/ansible/debian/Dockerfile +++ b/images/ansible/debian/Dockerfile @@ -10,7 +10,7 @@ RUN set -eux \ python3-setuptools \ && PIP_ARGS="" \ && eval 'version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }' \ - && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2)" "11.99"; then PIP_ARGS="--break-system-packages"; fi \ + && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2)" "11"; then PIP_ARGS="--break-system-packages"; fi \ && pip3 install --upgrade pip ${PIP_ARGS} \ && pip3 install --no-cache-dir ${PIP_ARGS} \ 'ansible<2.11' \ diff --git a/images/aws/debian/Dockerfile b/images/aws/debian/Dockerfile index 9e32f22..f9652c3 100644 --- a/images/aws/debian/Dockerfile +++ b/images/aws/debian/Dockerfile @@ -9,7 +9,7 @@ RUN set -eux \ python3-setuptools \ && PIP_ARGS="" \ && eval 'version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }' \ - && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2)" "11.99"; then PIP_ARGS="--break-system-packages"; fi \ + && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2)" "11"; then PIP_ARGS="--break-system-packages"; fi \ && pip3 install --no-cache-dir ${PIP_ARGS} \ awscli \ && rm -rf /var/lib/apt/lists/* diff --git a/images/extended/debian/Dockerfile b/images/extended/debian/Dockerfile index b1ac92f..4ad7fd2 100644 --- a/images/extended/debian/Dockerfile +++ b/images/extended/debian/Dockerfile @@ -11,7 +11,7 @@ RUN set -eux \ python3-setuptools \ && PIP_ARGS="" \ && eval 'version_gt() { test "$(printf "%s\n" "$@" | sort -V | head -n 1)" != "$1"; }' \ - && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2)" "11.99"; then PIP_ARGS="--break-system-packages"; fi \ + && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2)" "11"; then PIP_ARGS="--break-system-packages"; fi \ && pip3 install --no-cache-dir ${PIP_ARGS} \ awscli \ && curl -fsSLo /tmp/google-cloud-sdk.tar.gz \