From b9b5fdb712a2ec59e7909d628a394361784b9397 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 13:40:39 -0700 Subject: [PATCH] docker: remove for loop --- install/docker/Dockerfile.full | 14 ++++++++------ install/docker/template/Dockerfile.full.header | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index ae5c45b13c..ca3262f123 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -84,12 +84,14 @@ RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED # pyvips is broken on x86 due to mismatch ffi # https://stackoverflow.com/questions/62658237/it-seems-that-the-version-of-the-libffi-library-seen-at-runtime-is-different-fro -RUN bash -c "for v in 3 3.9; \ - do \ - python$v -m pip install --upgrade pip && \ - python$v -m pip install --force-reinstall --no-binary :all: cffi && \ - python$v -m pip install debugpy typing_extensions psutil; \ - done" +RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED +RUN python3 -m pip install --upgrade pip +RUN python3 -m pip install --force-reinstall --no-binary :all: cffi +RUN python3 -m pip install debugpy typing_extensions psutil + +RUN python3.9 -m pip install --upgrade pip +RUN python3.9 -m pip install --force-reinstall --no-binary :all: cffi +RUN python3.9 -m pip install debugpy typing_extensions psutil ################################################################ # End section generated from template/Dockerfile.full.header diff --git a/install/docker/template/Dockerfile.full.header b/install/docker/template/Dockerfile.full.header index 7d6423e76e..6f6aa96e67 100644 --- a/install/docker/template/Dockerfile.full.header +++ b/install/docker/template/Dockerfile.full.header @@ -81,12 +81,14 @@ RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED # pyvips is broken on x86 due to mismatch ffi # https://stackoverflow.com/questions/62658237/it-seems-that-the-version-of-the-libffi-library-seen-at-runtime-is-different-fro -RUN bash -c "for v in 3 3.9; \ - do \ - python$v -m pip install --upgrade pip && \ - python$v -m pip install --force-reinstall --no-binary :all: cffi && \ - python$v -m pip install debugpy typing_extensions psutil; \ - done" +RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED +RUN python3 -m pip install --upgrade pip +RUN python3 -m pip install --force-reinstall --no-binary :all: cffi +RUN python3 -m pip install debugpy typing_extensions psutil + +RUN python3.9 -m pip install --upgrade pip +RUN python3.9 -m pip install --force-reinstall --no-binary :all: cffi +RUN python3.9 -m pip install debugpy typing_extensions psutil ################################################################ # End section generated from template/Dockerfile.full.header