auto update of tag

toolforge · Aug 1, 2023 · 7796252 · 7796252
1 parent 1b99c87
commit 7796252
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 56 deletions.
diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile
@@ -44,9 +44,17 @@ RUN pip --no-cache-dir install -U pip setuptools wheel
 
 # Install base notebook packages
 RUN pip install --prefix=/srv/paws --no-cache-dir \
-    jupyterhub==4.0.0 \
-    jupyterlab==4.0.3
-
+    jupyterhub==4.0.1 \
+    notebook==6.5.5 \
+    jupyterlab==4.0.3 # strange ui ... though not in minikube
+    #jupyterlab==4.0.2 # works
+    #jupyterlab==4.0.0 # works
+    #jupyterlab==3.6.3 # works
+
+    # notebook and jupyter installed together seems to remove the console (tree mode)
+    # jupyterlab 4.0.2 by itself seems to work fine.
+    #notebook \
+    #jupyterlab==4.0.2 
 ## End minimal setup ##
 
 USER root
@@ -187,56 +195,56 @@ USER root
 # Machine-learning type stuff
 RUN apt-get update && \
     apt-get install --yes \
-    # For scipy & friends
-    libblas-dev \
-    liblapack-dev \
-    libquadmath0 \
-    gfortran \
-    # for lxml
-    libxml2-dev \
-    libxslt1-dev \
-    # for matplotlib
-    libfreetype6-dev \
-    libpng-dev \
-    # for ipython kernels
-    libzmq3-dev \
-    libreadline-dev \
-    # For PDFs and stuff
-    pandoc \
-    texlive-xetex
-
-
-## Install Julia
-# Install Julia directories and depot path
-
-ENV PATH=$PATH:/srv/julia/bin
-ENV JULIA_DEPOT_PATH /srv/julia-depot/
-RUN install -d -o ${NB_USER} -g ${NB_USER} /srv/julia
-RUN install -d -o ${NB_USER} -g ${NB_USER} ${JULIA_DEPOT_PATH}
-
-USER ${NB_USER}
-
-# install julia and julia kernel
-COPY install-julia /tmp/install-julia
-RUN /tmp/install-julia
-
-## Done Installing Julia
-
-
-RUN pip install --no-cache-dir \
-    jupyterlab-link-share>=0.2.4 \
-    nbgitpuller \
-#    voila # 0.4.0 downgrades jupyter-server to 1.24.0 appears to work on 2.0 from 0.5.0, though not yet released.
-    bash_kernel
-
-# Install the bash kernel
-RUN python -m bash_kernel.install --sys-prefix
-
-
-
-# Install mass amount of python libraries!
-COPY --chown=tools.paws:tools.paws requirements.txt /tmp/requirements.txt
-
+    # For scipy & friends#
+    libblas-dev \        #
+    liblapack-dev \      #
+    libquadmath0 \       #
+    gfortran \           #
+    # for lxml           #
+    libxml2-dev \        #
+    libxslt1-dev \       #
+    # for matplotlib     #
+    libfreetype6-dev \   #
+    libpng-dev \         #
+    # for ipython kernels#
+    libzmq3-dev \        #
+    libreadline-dev \    #
+    # For PDFs and stuff #
+    pandoc \             #
+    texlive-xetex        #
+                         #
+                         #
+## Install Julia         #
+# Install Julia directori#es and depot path
+                         #
+ENV PATH=$PATH:/srv/julia#/bin
+ENV JULIA_DEPOT_PATH /srv#/julia-depot/
+RUN install -d -o ${NB_US#ER} -g ${NB_USER} /srv/julia
+RUN install -d -o ${NB_US#ER} -g ${NB_USER} ${JULIA_DEPOT_PATH}
+                         #
+USER ${NB_USER}          #
+                         #
+# install julia and julia# kernel
+COPY install-julia /tmp/i#nstall-julia
+RUN /tmp/install-julia   #
+                         #
+## Done Installing Julia #
+                         #
+                         #
+RUN pip install --no-cach#e-dir \
+    jupyterlab-link-share#>=0.2.4 \
+#    nbgitpuller \       #
+#    voila # 0.4.0 downgr#ades jupyter-server to 1.24.0 appears to work on 2.0 from 0.5.0, though not yet released.
+    bash_kernel          #
+                         #
+# Install the bash kernel#
+RUN python -m bash_kernel#.install --sys-prefix
+                         #
+                         #
+                         #
+# Install mass amount of #python libraries!
+COPY --chown=tools.paws:t#ools.paws requirements.txt /tmp/requirements.txt
+                         #
 RUN pip --no-cache-dir install -r /tmp/requirements.txt
 
 # Install pywikibot
@@ -262,3 +270,5 @@ COPY banner /etc/bash.bashrc
 COPY --chown=tools.paws:tools.paws hide_clusters_tab.css /home/paws/.jupyter/custom/custom.css
 
 EXPOSE 8888
+
+CMD ["jupyter", "lab"]
diff --git a/paws/values.yaml b/paws/values.yaml
@@ -235,6 +235,7 @@ jupyterhub:
                       },
                   ]
 
+          c.OAuthenticator.allow_all = True
           c.JupyterHub.authenticator_class = Auth
           c.JupyterHub.authenticate_prometheus = False
           c.JupyterHub.logo_file = '/srv/jupyterhub/PAWS.svg'
@@ -255,7 +256,7 @@ jupyterhub:
       fsGroup: 52771
     image:
       name: quay.io/wikimedia-paws-prod/paws-hub
-      tag: pr-236 # paws-hub tag managed by github actions
+      tag: pr-317 # paws-hub tag managed by github actions
     containerSecurityContext:
       runAsUser: 52771
     resources:
@@ -278,11 +279,10 @@ jupyterhub:
   singleuser:
     cmd:
       - jupyterhub-singleuser
-      - --LabApp.collaborative=true
     fsGid: 52771
     image:
       name: quay.io/wikimedia-paws-prod/singleuser
-      tag: pr-315 # singleuser tag managed by github actions
+      tag: pr-317 # singleuser tag managed by github actions
       pullPolicy: Always
     memory:
       guarantee: 1G