Merge pull request #1 from minrk/conda

update conda builder

singleuser-builder-conda/Dockerfile

@@ -13,22 +13,21 @@ RUN apt-get update && \
             git && \
     apt-get purge && apt-get clean
 
-ENV CONDA_DIR /opt/conda
+ENV CONDA_DIR=/opt/conda \
-ENV PATH $CONDA_DIR/envs/base/bin:$CONDA_DIR/bin/:$PATH
+    PATH=/opt/conda/bin:$PATH \
-ENV NB_USER jovyan
+    NB_USER=jovyan \
+    HOME=/home/jovyan
 
 RUN adduser --disabled-password --gecos "Default Jupyter user" ${NB_USER}
 
-WORKDIR /home/${NB_USER}
+WORKDIR $HOME
-ADD install-miniconda.bash /usr/local/bin/install-miniconda.bash
+ADD install-miniconda.bash /tmp/
+ADD environment.yml /tmp/
 
-RUN /usr/local/bin/install-miniconda.bash
+RUN bash /tmp/install-miniconda.bash && \
+    rm /tmp/install-miniconda.bash /tmp/environment.yml
 
 USER $NB_USER
-ADD environment.yml .
-RUN conda env create --quiet -n base && conda clean -tipsy
-RUN rm environment.yml
-
 COPY ./s2i/bin/ /usr/libexec/s2i
 
 EXPOSE 8888

singleuser-builder-conda/Makefile

@@ -1,5 +1,5 @@
 
-IMAGE_NAME = jupyterhub/singleuser-builder-miniconda
+IMAGE_NAME = jupyterhub/singleuser-builder-conda
 VERSION = $(shell cat version)
 
 .PHONY: build

singleuser-builder-conda/environment.yml

@@ -1,7 +1,8 @@
-name: base
 dependencies:
-- notebook==5.0.0
+  - python==3.6.1
-- ipykernel==4.6.0
+  - notebook==5.0.0
-- ipywidgets==6.0.0
+  - ipython==6.0.0
-- pip:
+  - ipykernel==4.6.0
+  - ipywidgets==6.0.0
+  - pip:
     - jupyterhub==0.7.2

singleuser-builder-conda/install-miniconda.bash

@@ -1,31 +1,35 @@
 #!/bin/bash
 # This downloads and installs a pinned version of miniconda
-set -e
+set -ex
 
-CONDA_VERSION=4.2.12
+cd $(dirname $0)
+CONDA_VERSION=4.3.14
 URL="https://repo.continuum.io/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"
-INSTALLER_PATH=/usr/local/sbin/miniconda-installer
+INSTALLER_PATH=/tmp/miniconda-installer.sh
 
 wget --quiet $URL -O ${INSTALLER_PATH}
 chmod +x ${INSTALLER_PATH}
 
 # Only MD5 checksums are available for miniconda
 # Can be obtained from https://repo.continuum.io/miniconda/
-MD5SUM="d0c7c71cc5659e54ab51f2005a8d96f3"
+MD5SUM="fc6fc37479e3e3fcf3f9ba52cae98991"
 
 if ! echo "${MD5SUM}  ${INSTALLER_PATH}" | md5sum  --quiet -c -; then
     echo "md5sum mismatch for ${INSTALLER_PATH}, exiting!"
     exit 1
 fi
 
-${INSTALLER_PATH} -f -b -p ${CONDA_DIR}
+bash ${INSTALLER_PATH} -b -p ${CONDA_DIR}
 
 # Allow easy direct installs from conda forge
 ${CONDA_DIR}/bin/conda config --system --add channels conda-forge
 
-# Do not attempt to auto update conda
+# Do not attempt to auto update conda or dependencies
 ${CONDA_DIR}/bin/conda config --system --set auto_update_conda false
+${CONDA_DIR}/bin/conda config --system --set update_dependencies false
+${CONDA_DIR}/bin/conda config --system --set show_channel_urls true
 
+${CONDA_DIR}/bin/conda env update -n root -f /tmp/environment.yml
 # Clean things out!
 ${CONDA_DIR}/bin/conda clean -tipsy
 

singleuser-builder-conda/s2i/bin/assemble

@@ -19,7 +19,8 @@ cp -Rf /tmp/src/. .
 
 echo "---> Building application from source..."
 if [ -f environment.yml ]; then
-    conda env update -n base -f environment.yml
+    conda env update -n root -f environment.yml
+    conda clean -tipsy
 elif [ -f requirements.txt ]; then
     pip install -r requirements.txt
 fi

singleuser-builder-conda/s2i/bin/run

@@ -7,5 +7,4 @@
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
 
-source activate base
 exec jupyter notebook --ip=0.0.0.0

singleuser-builder-conda/version

@@ -1 +1 @@
-v0.1.4
+v0.1.5