From ebcfef012f1fa4138dfc173e8e2d13353fb09141 Mon Sep 17 00:00:00 2001
From: Ian Rodney <ian.rodney@gmail.com>
Date: Mon, 27 Jul 2020 16:18:12 -0700
Subject: [PATCH] [docker] Uses Latest Conda & Py 3.7 (#9732)

---
 docker/base-deps/Dockerfile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/docker/base-deps/Dockerfile b/docker/base-deps/Dockerfile
index bb309d502..2947a7ae4 100644
--- a/docker/base-deps/Dockerfile
+++ b/docker/base-deps/Dockerfile
@@ -17,21 +17,22 @@ RUN apt-get update -y && apt-get upgrade -y \
         rsync \
         openssh-client \
     && apt-get clean \
-    && echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh \
     && wget \
-        --quiet "https://repo.anaconda.com/miniconda/Miniconda3-4.7.12.1-Linux-x86_64.sh" \
-        -O /tmp/anaconda.sh \
-    && /bin/bash /tmp/anaconda.sh -b -p /opt/conda \
-    && rm /tmp/anaconda.sh \
-    && /opt/conda/bin/conda install -y \
-        libgcc python=3.6.9 \
-    && /opt/conda/bin/conda clean -y --all \
-    && /opt/conda/bin/pip install --no-cache-dir \
+        --quiet "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh" \
+        -O /tmp/miniconda.sh \
+    && /bin/bash /tmp/miniconda.sh -b -u -p $HOME/anaconda3 \
+    && $HOME/anaconda3/bin/conda init \ 
+    && echo 'export PATH=$HOME/anaconda3/bin:$PATH' > /etc/profile.d/conda.sh \
+    && rm /tmp/miniconda.sh \
+    && $HOME/anaconda3/bin/conda install -y \
+        libgcc python=3.7.7 \ 
+    && $HOME/anaconda3/bin/conda clean -y --all \
+    && $HOME/anaconda3/bin/pip install --no-cache-dir \
         flatbuffers \
         cython==0.29.0 \
         numpy==1.15.4 \
     # To avoid the following error on Jenkins:
     # AttributeError: 'numpy.ufunc' object has no attribute '__module__'
-    && /opt/conda/bin/pip uninstall -y dask
+    && $HOME/anaconda3/bin/pip uninstall -y dask
 
-ENV PATH "/opt/conda/bin:$PATH"
+ENV PATH "$HOME/anaconda3/bin:$PATH"