From 6c2df2d29527fe4c01c542f06a5f3d51d357a16e Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 23 Oct 2017 09:19:06 -0700 Subject: [PATCH 1/6] Remove jupyterhub from miniconda bash script --- repo2docker/files/conda/install-miniconda.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo2docker/files/conda/install-miniconda.bash b/repo2docker/files/conda/install-miniconda.bash index 9104154d..58a67783 100755 --- a/repo2docker/files/conda/install-miniconda.bash +++ b/repo2docker/files/conda/install-miniconda.bash @@ -30,7 +30,7 @@ ${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 -${CONDA_DIR}/bin/pip install --no-cache-dir jupyterhub==${JUPYTERHUB_VERSION} + # Clean things out! ${CONDA_DIR}/bin/conda clean -tipsy From 991e4ad4e23db82763fe21ae00c7a75db5a19f14 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 23 Oct 2017 09:19:33 -0700 Subject: [PATCH 2/6] update docstring to include binderhub --- repo2docker/app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repo2docker/app.py b/repo2docker/app.py index 333ac095..e43f6bc9 100644 --- a/repo2docker/app.py +++ b/repo2docker/app.py @@ -1,6 +1,7 @@ """repo2docker: convert git repositories into jupyter-suitable docker images -Images produced by repo2docker can be used with Jupyter notebooks standalone or via JupyterHub. +Images produced by repo2docker can be used with Jupyter notebooks standalone, +with BinderHub, or with JupyterHub. Usage: From ff3dfffbdbfb67d3e18b40dd082241234f3227f9 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 23 Oct 2017 09:30:24 -0700 Subject: [PATCH 3/6] Remove jupyterhub from buildpack and default build script --- repo2docker/detectors.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/repo2docker/detectors.py b/repo2docker/detectors.py index 0ba5dd27..9f056598 100644 --- a/repo2docker/detectors.py +++ b/repo2docker/detectors.py @@ -64,9 +64,6 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* {% endif -%} -# make JUPYTERHUB_VERSION a build argument -ARG JUPYTERHUB_VERSION=0.7.2 - EXPOSE 8888 {% if env -%} @@ -139,21 +136,6 @@ class BuildPack(LoggingConfigurable): and there are *some* general guarantees of ordering. """ - - jupyterhub_version = Unicode( - '0.7.2', - config=True, - help="""JupyterHub version to install. - - In general, the JupyterHub version in the image - and the Hub itself should have the same version number. - """ - ) - @default('jupyterhub_version') - def _jupyterhub_version_default(self): - """Allow setting JUPYTERHUB_VERSION via env""" - return os.environ.get('JUPYTERHUB_VERSION') or '0.7.2' - packages = Set( help=""" List of packages that are installed in this BuildPack by default. @@ -511,7 +493,6 @@ class PythonBuildPack(BuildPack): r""" pip install --no-cache-dir \ notebook==5.2.0 \ - jupyterhub==${JUPYTERHUB_VERSION} \ ipywidgets==6.0.0 \ jupyterlab==0.28 && \ jupyter nbextension enable --py widgetsnbextension --sys-prefix && \ From 03698bf4258b76e2b64e6b0b929f563da906b3ad Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 23 Oct 2017 09:33:27 -0700 Subject: [PATCH 4/6] Remove jupyterhub from buildargs except leave for legacy --- repo2docker/detectors.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/repo2docker/detectors.py b/repo2docker/detectors.py index 9f056598..6d6d67c7 100644 --- a/repo2docker/detectors.py +++ b/repo2docker/detectors.py @@ -398,9 +398,7 @@ class BuildPack(LoggingConfigurable): fileobj=tarf, tag=image_spec, custom_context=True, - buildargs={ - 'JUPYTERHUB_VERSION': self.jupyterhub_version, - }, + buildargs={}, decode=True, ): yield line @@ -714,9 +712,7 @@ class DockerBuildPack(BuildPack): path=os.getcwd(), dockerfile=self.binder_path(self.dockerfile), tag=image_spec, - buildargs={ - 'JUPYTERHUB_VERSION': self.jupyterhub_version, - }, + buildargs={}, decode=True, ): yield line From 5b1090ca387eefa714c6d65be8e9b19ebcd84bb8 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 23 Oct 2017 15:12:08 -0700 Subject: [PATCH 5/6] Remove jupyterhub from test dockerfiles --- tests/dockerfile/binder-dir/binder/Dockerfile | 3 --- tests/dockerfile/jupyter-stack/Dockerfile | 3 --- tests/dockerfile/simple/Dockerfile | 3 --- 3 files changed, 9 deletions(-) diff --git a/tests/dockerfile/binder-dir/binder/Dockerfile b/tests/dockerfile/binder-dir/binder/Dockerfile index 7bdfa564..4b721de4 100644 --- a/tests/dockerfile/binder-dir/binder/Dockerfile +++ b/tests/dockerfile/binder-dir/binder/Dockerfile @@ -1,8 +1,5 @@ FROM python:3.5 -ARG JUPYTERHUB_VERSION -RUN pip3 install jupyterhub==$JUPYTERHUB_VERSION - ENTRYPOINT "/bin/sh" ADD sayhi.sh /usr/local/bin/sayhi.sh diff --git a/tests/dockerfile/jupyter-stack/Dockerfile b/tests/dockerfile/jupyter-stack/Dockerfile index 5155eaf7..a25b0cdb 100644 --- a/tests/dockerfile/jupyter-stack/Dockerfile +++ b/tests/dockerfile/jupyter-stack/Dockerfile @@ -1,7 +1,4 @@ FROM jupyter/base-notebook:b4dd11e16ae4 -ARG JUPYTERHUB_VERSION -RUN pip install jupyterhub==$JUPYTERHUB_VERSION - RUN pip install there ADD verify verify diff --git a/tests/dockerfile/simple/Dockerfile b/tests/dockerfile/simple/Dockerfile index 7bdfa564..4b721de4 100644 --- a/tests/dockerfile/simple/Dockerfile +++ b/tests/dockerfile/simple/Dockerfile @@ -1,8 +1,5 @@ FROM python:3.5 -ARG JUPYTERHUB_VERSION -RUN pip3 install jupyterhub==$JUPYTERHUB_VERSION - ENTRYPOINT "/bin/sh" ADD sayhi.sh /usr/local/bin/sayhi.sh From fd5f98d5eb58e57c0b80dde5a186da5912dd6a83 Mon Sep 17 00:00:00 2001 From: Carol Willing Date: Mon, 23 Oct 2017 15:39:01 -0700 Subject: [PATCH 6/6] Edit per @yuvipanda review --- repo2docker/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo2docker/app.py b/repo2docker/app.py index e43f6bc9..37f173d9 100644 --- a/repo2docker/app.py +++ b/repo2docker/app.py @@ -1,7 +1,7 @@ """repo2docker: convert git repositories into jupyter-suitable docker images -Images produced by repo2docker can be used with Jupyter notebooks standalone, -with BinderHub, or with JupyterHub. +Images produced by repo2docker can be used with Jupyter notebooks standalone +or with BinderHub. Usage: