Revert "Merge branch 'cuda-base' into 'master'"

This reverts merge request !46
minjac · Aug 31, 2020 · b918a3f · b918a3f
1 parent c65eb29
commit b918a3f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/docker/amd64/Dockerfile.centos7 b/docker/amd64/Dockerfile.centos7
@@ -33,9 +33,8 @@ RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' &
     go install -ldflags="-s -w" -v nvidia-device-plugin
 
 
-FROM nvidia/cuda:10.2-base-centos7
+FROM centos:7
 
-ENV NVIDIA_REQUIRE_CUDA=""
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
 

diff --git a/docker/amd64/Dockerfile.ubi8 b/docker/amd64/Dockerfile.ubi8
@@ -33,9 +33,8 @@ RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' &
     go install -ldflags="-s -w" -v nvidia-device-plugin
 
 
-FROM nvidia/cuda:10.2-base-ubi8
+FROM registry.access.redhat.com/ubi8:latest
 
-ENV NVIDIA_REQUIRE_CUDA=""
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
 

diff --git a/docker/amd64/Dockerfile.ubuntu16.04 b/docker/amd64/Dockerfile.ubuntu16.04
@@ -33,9 +33,8 @@ RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' &
     go install -ldflags="-s -w" -v nvidia-device-plugin
 
 
-FROM nvidia/cuda:10.2-base-ubuntu16.04
+FROM debian:stretch-slim
 
-ENV NVIDIA_REQUIRE_CUDA=""
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
 

diff --git a/docker/ppc64le/Dockerfile.centos7 b/docker/ppc64le/Dockerfile.centos7
@@ -33,9 +33,8 @@ RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' &
     go install -ldflags="-s -w" -v nvidia-device-plugin
 
 
-FROM nvidia/cuda-ppc64le:10.2-base-centos7
+FROM --platform=ppc64le centos:7
 
-ENV NVIDIA_REQUIRE_CUDA=""
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
 

diff --git a/docker/ppc64le/Dockerfile.ubuntu16.04 b/docker/ppc64le/Dockerfile.ubuntu16.04
@@ -33,9 +33,8 @@ RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' &
     go install -ldflags="-s -w" -v nvidia-device-plugin
 
 
-FROM nvidia/cuda-ppc64le:10.2-base-ubuntu16.04
+FROM --platform=ppc64le debian:stretch-slim
 
-ENV NVIDIA_REQUIRE_CUDA=""
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility