charts: update variables

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.11.1 as react-builder
+FROM node:8.11.1-alpine as react-builder
 
 # Uncomment the following line to allow live updating of files for development.
 # ADD . /app

helm-chart/chartpress.yaml

@@ -24,7 +24,7 @@ charts:
         contextPath: ../singleuser
         buildArgs:
           JUPYTERHUB_VERSION: "0.9.2"
-          RENKU_VERSION: "0.2.0rc1"
+          RENKU_VERSION: "0.2.0"
         dockerfilePath: ../singleuser/Dockerfile
         valuesPath: jupyterhub.singleuser.image
         paths:

helm-chart/renku-notebooks/templates/deployment.yaml

@@ -28,6 +28,8 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            - name: DEFAULT_NOTEBOOK_IMAGE
+              value: "{{ .Values.jupyterhub.singleuser.image.name }}:{{ .Values.jupyterhub.singleuser.image.tag }}"
             {{ if eq .Values.debug true }}
             - name: FLASK_DEBUG
               value: "1"
@@ -49,11 +51,13 @@ spec:
             - name: GITLAB_REGISTRY_SECRET
               value: {{ template "renku.fullname" . }}-registry
             - name: GITLAB_URL
-            {{ if .Values.gitlab_url }}
-              value: {{ .Values.gitlab_url }}
+            {{ if .Values.global.gitlab.url }}
+              value: {{ .Values.gitlab.url }}
             {{ else }}
               value: {{ template "notebooks.http" . }}://{{ .Values.global.renku.domain}}/gitlab
             {{ end }}
+            - name: IMAGE_BUILD_TIMEOUT
+              value: "{{ .Values.imageBuildTimeout }}"
             - name: IMAGE_REGISTRY
               value: {{ .Values.imageRegistry }}
           ports:

helm-chart/renku-notebooks/values.yaml

@@ -5,9 +5,9 @@
 global:
   useHTTPS: false
 
-  ## specify the GitLab instance URL
-  # gitlab:
-  #   url:
+  gitlab:
+    ## specify the GitLab instance URL
+    url:
 
 replicaCount: 1
 
@@ -31,6 +31,9 @@ image:
 ## Set the default image registry
 # imageRegistry:
 
+## set the image build timeout
+imageBuildTimeout: '600'
+
 # enable the security context - if using telepresence for development, disable it
 securityContext:
   enabled: true

jupyterhub/jupyterhub-k8s.Dockerfile

@@ -1,9 +1,9 @@
-FROM jupyterhub/k8s-hub:bf3550b
+FROM jupyterhub/k8s-hub:0.7.0
 
 USER root
 
-COPY requirements-k8s.txt /tmp/requirements.renku.txt
-RUN pip3 install -r /tmp/requirements.renku.txt --no-cache-dir
+COPY requirements-k8s.txt /tmp/requirements.txt
+RUN pip3 install -r /tmp/requirements.txt --no-cache-dir
 
 COPY spawners.py /usr/local/lib/python3.6/dist-packages/
 

singleuser/Dockerfile

@@ -1,12 +1,12 @@
 # Build as renku/singleuser
 # Run with the DockerSpawner in JupyterHub
 
-ARG JUPYTERHUB_VERSION=0.9
+ARG JUPYTERHUB_VERSION=0.9.2
 ARG BASE_IMAGE=jupyterhub/singleuser:$JUPYTERHUB_VERSION
 
 FROM $BASE_IMAGE
 ARG JUPYTERHUB_VERSION
-ARG RENKU_VERSION=0.2.0rc1
+ARG RENKU_VERSION=0.2.0
 MAINTAINER Swiss Data Science Center <info@datascience.ch>
 
 
@@ -33,8 +33,10 @@ RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.d
 USER $NB_USER
 
 # install jupyterlab, papermill, git extension and renku-jupyterlab-ts
+COPY requirements.txt /tmp/requirements.txt
+
 RUN python3 -m pip install -U pip && \
-    pip install -U jupyterlab papermill && \
+    pip install -r /tmp/requirements.txt && \
     jupyter labextension update @jupyterlab/hub-extension --no-build && \
     jupyter labextension install @jupyterlab/git --no-build && \
     jupyter labextension install renku-jupyterlab-ts --no-build && \

singleuser/requirements.txt

@@ -0,0 +1,2 @@
+jupyterlab==0.34.0
+papermill

src/notebooks_service.py

@@ -260,9 +260,10 @@ def get_notebook_image(user, namespace, project, commit_sha):
     gl_project = get_gitlab_project(user, namespace, project)
 
     # image build timeout -- configurable, defaults to 10 minutes
-    image_build_timeout = int(os.getenv('GITLAB_IMAGE_BUILD_TIMEOUT', 600))
+    image_build_timeout = int(os.getenv('IMAGE_BUILD_TIMEOUT', 600))
+
+    image = os.getenv('DEFAULT_NOTEBOOK_IMAGE', 'renku/singleuser:latest')
 
-    image = 'renku/singleuser:latest'
     commit_sha_7 = commit_sha[:7]
 
     for pipeline in gl_project.pipelines.list():