Merge pull request #22 from jupyter/lab

Add JupyterLab to the default environment for venv + conda builders

repo2docker/detectors.py

@@ -121,7 +121,7 @@ class S2IBuildPack(BuildPack):
         except subprocess.CalledProcessError:
             self.log.error('Failed to build image!', extra=dict(phase='failed'))
             sys.exit(1)
-    
+
     def build(self, workdir, ref, output_image_spec):
         return self.s2i_build(workdir, ref, output_image_spec, self.build_image)
 
@@ -130,7 +130,7 @@ class CondaBuildPack(S2IBuildPack):
     """Build Pack for installing from a conda environment.yml using S2I"""
 
     name = Unicode('conda')
-    build_image = Unicode('jupyterhub/singleuser-builder-conda:v0.2.0', config=True)
+    build_image = Unicode('jupyterhub/singleuser-builder-conda:v0.2.1', config=True)
 
     def detect(self, workdir):
         return os.path.exists(os.path.join(workdir, 'environment.yml'))
@@ -140,8 +140,8 @@ class PythonBuildPack(S2IBuildPack):
     """Build Pack for installing from a pip requirements.txt using S2I"""
     name = Unicode('python-pip')
     runtime_builder_map = Dict({
-        'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.2.0',
-        'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.2.0',
+        'python-2.7': 'jupyterhub/singleuser-builder-venv-2.7:v0.2.1',
+        'python-3.5': 'jupyterhub/singleuser-builder-venv-3.5:v0.2.1',
     })
 
     runtime = Unicode(
@@ -160,7 +160,7 @@ class PythonBuildPack(S2IBuildPack):
             return True
 
 class DefaultBuildPack(S2IBuildPack):
-    build_image = Unicode('jupyterhub/singleuser-builder-venv-3.5:v0.2.0')
+    build_image = Unicode('jupyterhub/singleuser-builder-venv-3.5:v0.2.1')
     name = Unicode('default')
     def detect(self, workdir):
         return True

s2i-builders/conda/environment.yml

@@ -4,5 +4,6 @@ dependencies:
   - ipython==6.0.0
   - ipykernel==4.6.0
   - ipywidgets==6.0.0
+  - jupyterlab==0.22.1
   - pip:
     - jupyterhub==0.7.2

s2i-builders/conda/version

@@ -1 +1 @@
-v0.2.0
+v0.2.1

s2i-builders/venv/Dockerfile

@@ -8,9 +8,14 @@ ENV APP_DIR /srv/app
 ENV PATH ${APP_DIR}/venv/bin:$PATH
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends \
+    apt-get install --yes \
             python3 \
             python3-venv \
+            python3-dev \
+            build-essential \
+            pkg-config \
+            libfreetype6-dev \
+            libpng-dev \
             tar \
             git \
             locales && \
@@ -32,8 +37,10 @@ WORKDIR /home/jovyan
 USER jovyan
 RUN python3 -m venv ${APP_DIR}/venv
 
-RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2 ipywidgets==5.2.3 && \
-    ${APP_DIR}/venv/bin/jupyter nbextension enable --py widgetsnbextension
+RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 jupyterhub==0.7.2 ipywidgets==5.2.3 jupyterlab==0.22.1 && \
+    ${APP_DIR}/venv/bin/jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
+    ${APP_DIR}/venv/bin/jupyter serverextension enable --py jupyterlab --sys-prefix
+
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 

s2i-builders/venv/Dockerfile.py2

@@ -8,10 +8,13 @@ ENV APP_DIR /srv/app
 ENV PATH ${APP_DIR}/venv/bin:$PATH
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends \
+    apt-get install --yes \
             python \
             python-dev \
             build-essential \
+            pkg-config \
+            libfreetype6-dev \
+            libpng-dev \
             virtualenv \
             tar \
             git \
@@ -34,8 +37,9 @@ WORKDIR /home/jovyan
 USER jovyan
 RUN virtualenv ${APP_DIR}/venv
 
-RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 git+https://github.com/yuvipanda/jupyterhub-legacy-singleuser@master ipywidgets==5.2.3 && \
-    ${APP_DIR}/venv/bin/jupyter nbextension enable --py widgetsnbextension
+RUN ${APP_DIR}/venv/bin/pip install --no-cache-dir notebook==5.0.0 git+https://github.com/yuvipanda/jupyterhub-legacy-singleuser@master ipywidgets==5.2.3 jupyterlab==0.22.1 && \
+    ${APP_DIR}/venv/bin/jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
+    ${APP_DIR}/venv/bin/jupyter serverextension enable --py jupyterlab --sys-prefix
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 

s2i-builders/venv/version

@@ -1 +1 @@
-v0.2.0
+v0.2.1