From 8c386259e0cfc9f6ab005563d7c5cc6e6cae601c Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Tue, 28 Jan 2025 11:28:42 -0800 Subject: [PATCH] Add /usr/local/nvidia/bin to PATH in ffmpeg image. This image is being used for some GPU tests. Also clean up /bin/nvidia/bin from PATH from all GPU images. It's not used. PiperOrigin-RevId: 720649135 --- images/benchmarks/ffmpeg/Dockerfile | 1 + images/gpu/cuda-tests/Dockerfile.x86_64 | 2 +- images/gpu/ollama/Dockerfile.x86_64 | 2 +- images/gpu/ollama/bench/Dockerfile.x86_64 | 2 +- images/gpu/ollama/singlemodel/Dockerfile.x86_64 | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/benchmarks/ffmpeg/Dockerfile b/images/benchmarks/ffmpeg/Dockerfile index fb8ca1846..31973e7d4 100644 --- a/images/benchmarks/ffmpeg/Dockerfile +++ b/images/benchmarks/ffmpeg/Dockerfile @@ -8,3 +8,4 @@ RUN set -x \ WORKDIR /media ADD https://samples.ffmpeg.org/MPEG-4/video.mp4 video.mp4 ADD https://samples.ffmpeg.org/A-codecs/Nelly_Moser/h264_NellyMoser.mp4 encoded.mp4 +ENV PATH=$PATH:/usr/local/nvidia/bin diff --git a/images/gpu/cuda-tests/Dockerfile.x86_64 b/images/gpu/cuda-tests/Dockerfile.x86_64 index 103f55a12..7196ba1a9 100644 --- a/images/gpu/cuda-tests/Dockerfile.x86_64 +++ b/images/gpu/cuda-tests/Dockerfile.x86_64 @@ -6,7 +6,7 @@ ARG CUDA_SAMPLES_VERSION=v12.2 WORKDIR / COPY *.cu *.h *.sh *.go *.cc / -ENV PATH=$PATH:/usr/local/nvidia/bin:/bin/nvidia/bin +ENV PATH=$PATH:/usr/local/nvidia/bin RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get update && \ apt-get install -y \ diff --git a/images/gpu/ollama/Dockerfile.x86_64 b/images/gpu/ollama/Dockerfile.x86_64 index 9fb12be2c..3a8f3791e 100644 --- a/images/gpu/ollama/Dockerfile.x86_64 +++ b/images/gpu/ollama/Dockerfile.x86_64 @@ -1,7 +1,7 @@ # https://hub.docker.com/r/ollama/ollama FROM ollama/ollama:0.5.1 -ENV PATH=$PATH:/usr/local/nvidia/bin:/bin/nvidia/bin +ENV PATH=$PATH:/usr/local/nvidia/bin ENV OLLAMA_ORIGINS=* ENV OLLAMA_HOST=0.0.0.0:11434 diff --git a/images/gpu/ollama/bench/Dockerfile.x86_64 b/images/gpu/ollama/bench/Dockerfile.x86_64 index 637324fc9..6eaa86c81 100644 --- a/images/gpu/ollama/bench/Dockerfile.x86_64 +++ b/images/gpu/ollama/bench/Dockerfile.x86_64 @@ -1,7 +1,7 @@ # https://hub.docker.com/r/ollama/ollama FROM ollama/ollama:0.5.1 -ENV PATH=$PATH:/usr/local/nvidia/bin:/bin/nvidia/bin +ENV PATH=$PATH:/usr/local/nvidia/bin ENV OLLAMA_ORIGINS=* ENV OLLAMA_HOST=0.0.0.0:11434 diff --git a/images/gpu/ollama/singlemodel/Dockerfile.x86_64 b/images/gpu/ollama/singlemodel/Dockerfile.x86_64 index 79d49031d..69a8a05f6 100644 --- a/images/gpu/ollama/singlemodel/Dockerfile.x86_64 +++ b/images/gpu/ollama/singlemodel/Dockerfile.x86_64 @@ -1,7 +1,7 @@ # https://hub.docker.com/r/ollama/ollama FROM ollama/ollama:0.5.1 -ENV PATH=$PATH:/usr/local/nvidia/bin:/bin/nvidia/bin +ENV PATH=$PATH:/usr/local/nvidia/bin ENV OLLAMA_ORIGINS=* ENV OLLAMA_HOST=0.0.0.0:11434