Do not install default version of numpy when building docker container

SINTEF · Aug 15, 2023 · c00714b · c00714b
1 parent 4bbb805
commit c00714b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/docker/Dockerfile-manylinux.template b/.github/docker/Dockerfile-manylinux.template
@@ -26,7 +26,7 @@ FROM quay.io/pypa/manylinux{{ TYPE }}_{{ ARCH }}:latest
 
 ARG PY_MINORS="7 8 9 10 11"
 
-COPY requirements.txt /tmp/requirements.txt
+#COPY requirements.txt /tmp/requirements.txt
 COPY requirements_full.txt /tmp/requirements_full.txt
 
 {{ EXTRA_PRE }}
@@ -58,7 +58,6 @@ RUN yum update -y && \
     python3.${minor} -m pip install -U pip && \
     python3.${minor} -m pip install -U setuptools wheel && \
     python3.${minor} -m pip install -U --cache-dir /ci/pip_cache cmake oldest-supported-numpy poetry && \
-    python3.${minor} -m pip install --cache-dir /ci/pip_cache --prefer-binary -r /tmp/requirements.txt && \
     python3.${minor} -m pip install --cache-dir /ci/pip_cache --prefer-binary -r /tmp/requirements_full.txt; \
   done
 

diff --git a/.github/docker/Dockerfile-mingw b/.github/docker/Dockerfile-mingw
@@ -46,6 +46,8 @@ RUN dnf install -y \
         cppcheck \
         doxygen \
         ccache \
+        rust \
+        cargo \
         wine-core \
         wine-filesystem \
         mingw-filesystem-base \

diff --git a/.github/docker/Dockerfile-musllinux.template b/.github/docker/Dockerfile-musllinux.template
@@ -23,7 +23,7 @@
 #
 FROM quay.io/pypa/musllinux{{ TYPE }}_{{ ARCH }}:latest
 
-COPY requirements.txt /tmp/requirements.txt
+#COPY requirements.txt /tmp/requirements.txt
 COPY requirements_full.txt /tmp/requirements_full.txt
 
 # Do not use distutils distributed with setuptools
@@ -48,6 +48,5 @@ RUN apk add -u \
     python3.${minor} -m pip install -U pip && \
     python3.${minor} -m pip install -U setuptools wheel && \
     python3.${minor} -m pip install -U --cache-dir /ci/pip_cache cmake oldest-supported-numpy poetry && \
-    python3.${minor} -m pip install --cache-dir /ci/pip_cache --prefer-binary -r /tmp/requirements.txt && \
     python3.${minor} -m pip install --cache-dir /ci/pip_cache --prefer-binary -r /tmp/requirements_full.txt; \
   done