updated dockers (#2459)

microsoft · Oct 7, 2019 · fdb3923 · fdb3923
1 parent d7f8aa5
commit fdb3923
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/docker/dockerfile-python b/docker/dockerfile-python
@@ -1,5 +1,8 @@
 FROM ubuntu:16.04
 
+ARG CONDA_DIR=/opt/conda
+ENV PATH $CONDA_DIR/bin:$PATH
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         cmake \
@@ -12,8 +15,8 @@ RUN apt-get update && \
 # python-package
     # miniconda
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
-    /bin/bash Miniconda3-latest-Linux-x86_64.sh -f -b -p /opt/conda && \
-    export PATH="/opt/conda/bin:$PATH" && \
+    /bin/bash Miniconda3-latest-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
+    export PATH="$CONDA_DIR/bin:$PATH" && \
     conda config --set always_yes yes --set changeps1 no && \
     # lightgbm
     conda install -q -y numpy scipy scikit-learn pandas && \
@@ -24,5 +27,3 @@ RUN apt-get update && \
     apt-get autoremove -y && apt-get clean && \
     conda clean -a -y && \
     rm -rf /usr/local/src/*
-
-ENV PATH /opt/conda/bin:$PATH
diff --git a/docker/gpu/dockerfile.gpu b/docker/gpu/dockerfile.gpu
@@ -69,9 +69,9 @@ ARG CONDA_DIR=/opt/conda
 ENV PATH $CONDA_DIR/bin:$PATH
 
 # Install miniconda
-RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
+RUN echo "export PATH=$CONDA_DIR/bin:"'$PATH' > /etc/profile.d/conda.sh && \
     wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
-    /bin/bash ~/miniconda.sh -b -p /opt/conda && \
+    /bin/bash ~/miniconda.sh -b -p $CONDA_DIR && \
     rm ~/miniconda.sh
 
 RUN conda config --set always_yes yes --set changeps1 no && \
@@ -112,8 +112,8 @@ RUN apt-get autoremove -y && apt-get clean && \
 # password key: --NotebookApp.password='sha1:98b767162d34:8da1bc3c75a0f29145769edc977375a373407824'
 
 # Add a notebook profile.
-RUN mkdir -p -m 700 /root/.jupyter/ && \
-    echo "c.NotebookApp.ip = '*'" >> /root/.jupyter/jupyter_notebook_config.py
+RUN mkdir -p -m 700 ~/.jupyter/ && \
+    echo "c.NotebookApp.ip = '*'" >> ~/.jupyter/jupyter_notebook_config.py
 
 VOLUME /home
 WORKDIR /home