From b27d4b583499fa603bf38fab9806ead386d5cf22 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 7 Mar 2024 18:36:40 -0800 Subject: [PATCH] images: don't build unused images Runtime and gpu tests are running on x86_64 only. PiperOrigin-RevId: 613771002 --- images/gpu/cuda-tests/{Dockerfile => Dockerfile.x86_64} | 0 images/gpu/ollama/{Dockerfile => Dockerfile.x86_64} | 0 images/gpu/ollama/bench/{Dockerfile => Dockerfile.x86_64} | 0 images/gpu/ollama/singlemodel/{Dockerfile => Dockerfile.x86_64} | 0 images/gpu/pytorch/{Dockerfile => Dockerfile.x86_64} | 0 images/runtimes/java17/{Dockerfile => Dockerfile.x86_64} | 0 images/runtimes/nodejs16.13.2/{Dockerfile => Dockerfile.x86_64} | 0 images/runtimes/php8.1.1/{Dockerfile => Dockerfile.x86_64} | 2 +- images/runtimes/python3.10.2/{Dockerfile => Dockerfile.x86_64} | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename images/gpu/cuda-tests/{Dockerfile => Dockerfile.x86_64} (100%) rename images/gpu/ollama/{Dockerfile => Dockerfile.x86_64} (100%) rename images/gpu/ollama/bench/{Dockerfile => Dockerfile.x86_64} (100%) rename images/gpu/ollama/singlemodel/{Dockerfile => Dockerfile.x86_64} (100%) rename images/gpu/pytorch/{Dockerfile => Dockerfile.x86_64} (100%) rename images/runtimes/java17/{Dockerfile => Dockerfile.x86_64} (100%) rename images/runtimes/nodejs16.13.2/{Dockerfile => Dockerfile.x86_64} (100%) rename images/runtimes/php8.1.1/{Dockerfile => Dockerfile.x86_64} (94%) rename images/runtimes/python3.10.2/{Dockerfile => Dockerfile.x86_64} (95%) diff --git a/images/gpu/cuda-tests/Dockerfile b/images/gpu/cuda-tests/Dockerfile.x86_64 similarity index 100% rename from images/gpu/cuda-tests/Dockerfile rename to images/gpu/cuda-tests/Dockerfile.x86_64 diff --git a/images/gpu/ollama/Dockerfile b/images/gpu/ollama/Dockerfile.x86_64 similarity index 100% rename from images/gpu/ollama/Dockerfile rename to images/gpu/ollama/Dockerfile.x86_64 diff --git a/images/gpu/ollama/bench/Dockerfile b/images/gpu/ollama/bench/Dockerfile.x86_64 similarity index 100% rename from images/gpu/ollama/bench/Dockerfile rename to images/gpu/ollama/bench/Dockerfile.x86_64 diff --git a/images/gpu/ollama/singlemodel/Dockerfile b/images/gpu/ollama/singlemodel/Dockerfile.x86_64 similarity index 100% rename from images/gpu/ollama/singlemodel/Dockerfile rename to images/gpu/ollama/singlemodel/Dockerfile.x86_64 diff --git a/images/gpu/pytorch/Dockerfile b/images/gpu/pytorch/Dockerfile.x86_64 similarity index 100% rename from images/gpu/pytorch/Dockerfile rename to images/gpu/pytorch/Dockerfile.x86_64 diff --git a/images/runtimes/java17/Dockerfile b/images/runtimes/java17/Dockerfile.x86_64 similarity index 100% rename from images/runtimes/java17/Dockerfile rename to images/runtimes/java17/Dockerfile.x86_64 diff --git a/images/runtimes/nodejs16.13.2/Dockerfile b/images/runtimes/nodejs16.13.2/Dockerfile.x86_64 similarity index 100% rename from images/runtimes/nodejs16.13.2/Dockerfile rename to images/runtimes/nodejs16.13.2/Dockerfile.x86_64 diff --git a/images/runtimes/php8.1.1/Dockerfile b/images/runtimes/php8.1.1/Dockerfile.x86_64 similarity index 94% rename from images/runtimes/php8.1.1/Dockerfile rename to images/runtimes/php8.1.1/Dockerfile.x86_64 index 1034fd3d1..d85db7c92 100644 --- a/images/runtimes/php8.1.1/Dockerfile +++ b/images/runtimes/php8.1.1/Dockerfile.x86_64 @@ -17,4 +17,4 @@ RUN tar -zxf php-${VERSION}.tar.gz WORKDIR /root/php-${VERSION} RUN ./configure -RUN make +RUN make -j $(nproc) diff --git a/images/runtimes/python3.10.2/Dockerfile b/images/runtimes/python3.10.2/Dockerfile.x86_64 similarity index 95% rename from images/runtimes/python3.10.2/Dockerfile rename to images/runtimes/python3.10.2/Dockerfile.x86_64 index 3ddec0fc4..4406865eb 100644 --- a/images/runtimes/python3.10.2/Dockerfile +++ b/images/runtimes/python3.10.2/Dockerfile.x86_64 @@ -18,4 +18,4 @@ RUN tar -zxf cpython-${VERSION}.tar.gz WORKDIR /root/cpython-${VERSION} RUN ./configure --with-pydebug -RUN make -s -j2 +RUN make -s -j $(nproc)