diff --git a/singleuser-builder-conda/Dockerfile b/singleuser-builder-conda/Dockerfile index b36cc5f4..a051c3bb 100644 --- a/singleuser-builder-conda/Dockerfile +++ b/singleuser-builder-conda/Dockerfile @@ -25,8 +25,9 @@ ADD install-miniconda.bash /usr/local/bin/install-miniconda.bash RUN /usr/local/bin/install-miniconda.bash USER $NB_USER -RUN pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2 ipywidgets==5.2.3 && \ - jupyter nbextension enable --py widgetsnbextension +ADD environment.yml . +RUN conda env create --quiet -n base +RUN rm environment.yml COPY ./s2i/bin/ /usr/libexec/s2i diff --git a/singleuser-builder-conda/environment.yml b/singleuser-builder-conda/environment.yml new file mode 100644 index 00000000..a5bddce5 --- /dev/null +++ b/singleuser-builder-conda/environment.yml @@ -0,0 +1,7 @@ +name: base +dependencies: +- notebook==5.0.0 +- ipykernel==4.6.0 +- ipywidgets==6.0.0 +- pip: + jupyterhub==0.7.2 diff --git a/singleuser-builder-conda/s2i/bin/assemble b/singleuser-builder-conda/s2i/bin/assemble index b2c14f41..bfe78e2c 100755 --- a/singleuser-builder-conda/s2i/bin/assemble +++ b/singleuser-builder-conda/s2i/bin/assemble @@ -19,7 +19,7 @@ cp -Rf /tmp/src/. . echo "---> Building application from source..." if [ -f environment.yml ]; then - conda env update -f environment.yml + conda env update -n base -f environment.yml elif [ -f requirements.txt ]; then pip install -r requirements.txt fi diff --git a/singleuser-builder-conda/s2i/bin/run b/singleuser-builder-conda/s2i/bin/run index b56c23fc..db855e17 100755 --- a/singleuser-builder-conda/s2i/bin/run +++ b/singleuser-builder-conda/s2i/bin/run @@ -7,4 +7,5 @@ # https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md # +source activate base exec jupyter notebook --ip=0.0.0.0 diff --git a/singleuser-builder-conda/version b/singleuser-builder-conda/version index 8308b63a..04e19464 100644 --- a/singleuser-builder-conda/version +++ b/singleuser-builder-conda/version @@ -1 +1 @@ -v0.1.1 +v0.1.3