From ce50407362c3b216db220a2099b96f870c9da83b Mon Sep 17 00:00:00 2001
From: Michael Schmitz <MichaelS@allenai.org>
Date: Fri, 6 Sep 2019 10:01:58 -0700
Subject: [PATCH] Revert "Use an NVIDIA base image. (#3177)" (#3222)

This reverts commit b1caa9e5e35b6dd12be6a4d6fdc8195f0b85451d.
---
 Dockerfile     |  9 +++++++++
 Dockerfile.pip | 32 +++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 17dc80b0728..278131763a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,15 @@ FROM python:3.6.8-stretch
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+ENV PATH /usr/local/nvidia/bin/:$PATH
+ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
+
+# Tell nvidia-docker the driver spec that we need as well as to
+# use all available devices, which are mounted at /usr/local/nvidia.
+# The LABEL supports an older version of nvidia-docker, the env
+# variables a newer one.
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 LABEL com.nvidia.volumes.needed="nvidia_driver"
 
 WORKDIR /stage/allennlp
diff --git a/Dockerfile.pip b/Dockerfile.pip
index 0bb9f2345b4..9ec70f6414f 100644
--- a/Dockerfile.pip
+++ b/Dockerfile.pip
@@ -1,35 +1,33 @@
 # This Dockerfile creates an environment suitable for downstream usage of AllenNLP.
 # It creates an environment that includes a pip installation of allennlp.
 
-FROM nvidia/cuda:10.0-base-ubuntu18.04
+FROM python:3.6.8-stretch
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+ENV PATH /usr/local/nvidia/bin/:$PATH
+ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
+
+# Tell nvidia-docker the driver spec that we need as well as to
+# use all available devices, which are mounted at /usr/local/nvidia.
+# The LABEL supports an older version of nvidia-docker, the env
+# variables a newer one.
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
+LABEL com.nvidia.volumes.needed="nvidia_driver"
+
 WORKDIR /stage/allennlp
 
 ARG VERSION
 ARG SOURCE_COMMIT
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-         build-essential \
-         cmake \
-         git \
-         python3.6-dev \
-         python3-setuptools \
-         python3-pip && \
-     rm -rf /var/lib/apt/lists/*
-
-RUN echo "alias python=python3\nalias pip=pip3" > ~/.bash_aliases
-
-RUN pip3 install wheel
-
 # Install the specified version of AllenNLP.
 RUN if [ ! -z "$VERSION" ]; \
-    then echo "Installing allennlp==$VERSION."; pip3 install allennlp==$VERSION; \
+    then echo "Installing allennlp==$VERSION."; pip install allennlp==$VERSION; \
     elif [ ! -z "$SOURCE_COMMIT" ]; \
-    then echo "Installing allennlp@$SOURCE_COMMIT"; pip3 install "git+git://github.com/allenai/allennlp.git@$SOURCE_COMMIT"; \
-    else echo "Installing the latest pip3 release of allennlp"; pip3 install allennlp; \
+    then echo "Installing allennlp@$SOURCE_COMMIT"; pip install "git+git://github.com/allenai/allennlp.git@$SOURCE_COMMIT"; \
+    else echo "Installing the latest pip release of allennlp"; pip install allennlp; \
     fi
 
 # Copy wrapper script to allow beaker to run resumable training workloads.