merge repos

rewardenv · Dec 29, 2023 · 8c6b01f · 8c6b01f
1 parent 4b104eb
commit 8c6b01f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/images/ansible/alpine/Dockerfile b/images/ansible/alpine/Dockerfile
@@ -10,7 +10,7 @@ RUN set -eux \
     py3-cryptography \
     && 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)" "3.18.99"; then PIP_ARGS="--break-system-packages"; fi \
+    && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2 | tr -d '"')" "3.18.99"; 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/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"; then PIP_ARGS="--break-system-packages"; fi \
+    && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2 | tr -d '"')" "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/alpine/Dockerfile b/images/aws/alpine/Dockerfile
@@ -8,7 +8,7 @@ RUN set -eux \
     py3-pip \
     && 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)" "3.18.99"; then PIP_ARGS="--break-system-packages"; fi \
+    && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2 | tr -d '"')" "3.18.99"; then PIP_ARGS="--break-system-packages"; fi \
     && pip3 install --upgrade pip $PIP_ARGS \
     && pip3 install --no-cache-dir --break-system-packages \
     awscli \

diff --git 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"; then PIP_ARGS="--break-system-packages"; fi \
+    && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2 | tr -d '"')" "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/alpine/Dockerfile b/images/extended/alpine/Dockerfile
@@ -10,7 +10,7 @@ RUN set -eux \
     py3-pip \
     && 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)" "3.18.99"; then PIP_ARGS="--break-system-packages"; fi \
+    && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2 | tr -d '"')" "3.18.99"; then PIP_ARGS="--break-system-packages"; fi \
     && pip3 install --no-cache-dir $PIP_ARGS \
     awscli \
     && curl -fsSLo /tmp/google-cloud-sdk.tar.gz \

diff --git 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"; then PIP_ARGS="--break-system-packages"; fi \
+    && if version_gt "$(cat /etc/os-release | grep 'VERSION_ID=' | cut -d'=' -f2 | tr -d '"')" "11"; then PIP_ARGS="--break-system-packages"; fi \
     && pip3 install --no-cache-dir ${PIP_ARGS} \
     awscli \
     && curl -fsSLo /tmp/google-cloud-sdk.tar.gz \