From efc4b2954e42ad521296e4d8d458427c899a9877 Mon Sep 17 00:00:00 2001 From: Jauder Ho Date: Sun, 10 Dec 2023 05:16:14 +0000 Subject: [PATCH] Fix ansible, sslyze and visidata Signed-off-by: Jauder Ho --- ansible/Dockerfile | 1 + ansible/Dockerfile.alpine | 14 +++++++------- sslyze/Dockerfile.alpine | 6 +++--- visidata/Dockerfile | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ansible/Dockerfile b/ansible/Dockerfile index ac1e41ce1c3a..a66cd2efe5a2 100644 --- a/ansible/Dockerfile +++ b/ansible/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=${DEBIAN_FRONTEND} apt-get install -y --no-install-recommends ${build_pkgs} ${runtime_pkgs} && \ python3 -m pip install --no-cache-dir --upgrade pip --break-system-packages && \ #python3 -m pip install --no-cache-dir --upgrade --ignore-installed packaging --break-system-packages && \ + pip3 install --no-cache-dir --upgrade wheel --break-system-packages && \ pip3 install --no-cache-dir -r requirements.txt --break-system-packages && \ apt-get purge -y ${build_pkgs} && \ apt-get autoremove -y --purge && \ diff --git a/ansible/Dockerfile.alpine b/ansible/Dockerfile.alpine index 4fd92c7690db..5a7317e9e9a0 100644 --- a/ansible/Dockerfile.alpine +++ b/ansible/Dockerfile.alpine @@ -19,13 +19,13 @@ RUN test -n "${BUILD_VERSION}" && \ runtime_pkgs="ca-certificates openssl openssh-client python3" && \ apk --no-cache add --virtual build-dependencies ${build_pkgs} && \ apk --no-cache add ${runtime_pkgs} && \ - python3 -m pip install --no-cache-dir --upgrade pip && \ - python3 -m pip install --no-cache-dir --upgrade --ignore-installed packaging && \ - pip3 install --no-cache-dir --upgrade wheel && \ - pip3 install --no-cache-dir --upgrade cryptography cffi certifi && \ - pip3 install --no-cache-dir ansible==${BUILD_VERSION} && \ - pip3 install --no-cache-dir ansible-lint && \ - pip3 install --no-cache-dir --upgrade pywinrm && \ + python3 -m pip install --no-cache-dir --upgrade pip --break-system-packages && \ + #python3 -m pip install --no-cache-dir --upgrade --ignore-installed packaging --break-system-packages && \ + pip3 install --no-cache-dir --upgrade wheel --break-system-packages && \ + pip3 install --no-cache-dir --upgrade cryptography cffi certifi --break-system-packages && \ + pip3 install --no-cache-dir ansible==${BUILD_VERSION} --break-system-packages && \ + pip3 install --no-cache-dir ansible-lint --break-system-packages && \ + pip3 install --no-cache-dir --upgrade pywinrm --break-system-packages && \ apk del build-dependencies && \ rm -rf /var/cache/apk/* && \ rm -rf /root/.cache/pip && \ diff --git a/sslyze/Dockerfile.alpine b/sslyze/Dockerfile.alpine index 86f4a67c41dd..ee464ef83941 100644 --- a/sslyze/Dockerfile.alpine +++ b/sslyze/Dockerfile.alpine @@ -17,9 +17,9 @@ RUN \ runtime_pkgs="ca-certificates openssl python3" && \ apk --no-cache add --virtual build-dependencies ${build_pkgs} && \ apk --no-cache add ${runtime_pkgs} && \ - python3 -m pip install --no-cache-dir --upgrade pip && \ - pip3 install --no-cache-dir --upgrade wheel && \ - pip3 install --no-cache-dir -r requirements.txt && \ + python3 -m pip install --no-cache-dir --upgrade pip --break-system-packages && \ + pip3 install --no-cache-dir --upgrade wheel --break-system-packages && \ + pip3 install --no-cache-dir -r requirements.txt --break-system-packages && \ apk del build-dependencies && \ rm -rf /var/cache/apk/* && \ rm -rf /root/.cache/pip && \ diff --git a/visidata/Dockerfile b/visidata/Dockerfile index 52eda05bb554..ca7ae0a34c02 100644 --- a/visidata/Dockerfile +++ b/visidata/Dockerfile @@ -16,9 +16,9 @@ RUN \ runtime_pkgs="ca-certificates openssl python3 py3-pip libxml2 libxslt" && \ apk --no-cache add --virtual build-dependencies ${build_pkgs} && \ apk --no-cache add ${runtime_pkgs} && \ - python3 -m pip install --no-cache-dir --upgrade pip && \ - pip3 install --no-cache-dir --upgrade wheel && \ - pip3 install --no-cache-dir -r requirements.txt && \ + python3 -m pip install --no-cache-dir --upgrade pip --break-system-packages && \ + pip3 install --no-cache-dir --upgrade wheel --break-system-packages && \ + pip3 install --no-cache-dir -r requirements.txt --break-system-packages && \ apk del build-dependencies && \ rm -rf /var/cache/apk/* && \ rm -rf /root/.cache/pip && \