docker: remove for loop

koush · Jun 8, 2023 · b9b5fdb · b9b5fdb
1 parent c85af9c
commit b9b5fdb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git 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
@@ -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