Upgrade to JupyterHub 5.2.1 (Z2JH 4.0.0), R 4.4.2

BASE_IMAGES.txt

@@ -1,4 +1,4 @@
-quay.io/jupyter/minimal-notebook:hub-4.1.5
-quay.io/jupyter/datascience-notebook:hub-4.1.5
-quay.io/jupyter/pytorch-notebook:cuda12-hub-4.1.5
-quay.io/jupyter/tensorflow-notebook:cuda-hub-4.1.5
+quay.io/jupyter/minimal-notebook:hub-5.2.1
+quay.io/jupyter/datascience-notebook:hub-5.2.1
+quay.io/jupyter/pytorch-notebook:cuda12-hub-5.2.1
+quay.io/jupyter/tensorflow-notebook:cuda-hub-5.2.1

extras/rstudio/Dockerfile

@@ -4,11 +4,15 @@
 # and make it easy to access
 #     (https://github.com/jupyterhub/jupyter-rsession-proxy).
 
-ARG RSTUDIO_DEB=rstudio-server-2024.04.1-748-amd64.deb
+ARG RSTUDIO_DEB=rstudio-server-2024.12.0-467-amd64.deb
 
 USER root
 
 RUN true \
+    #
+    # Upgrade R.
+    #
+    && mamba install -y 'r-base~=4.4.2' \
     #
     # Install only the RStudio package.
     # R itself is already installed into the Conda environment.

notebooks/htc-datascience-notebook/Dockerfile

@@ -7,7 +7,7 @@
 # Copyright (C) HTCondor Team, Computer Sciences Dept, Univ of Wisconsin-Madison
 # Distributed under terms of the Apache Licence, Version 2.0.
 
-FROM quay.io/jupyter/datascience-notebook:hub-4.1.5
+FROM quay.io/jupyter/datascience-notebook:hub-5.2.1
 LABEL maintainer="[email protected]"
 USER root
 
@@ -26,8 +26,10 @@ RUN apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y curl git gnupg less man openjdk-21-jdk vim wget \
     #
-    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
-    && echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
+    # Install HTCondor.
+    #
+    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-24.x-Key | apt-key add - \
+    && echo "deb http://research.cs.wisc.edu/htcondor/repo/ubuntu/24.x noble main" > /etc/apt/sources.list.d/htcondor.list \
     && apt-get update -y \
     && apt-get install -y minihtcondor pelican pelican-osdf-compat \
     && apt-get clean -y \
@@ -99,7 +101,7 @@ RUN groupadd -r -g 990 sssd \
 ########################
 # Add support for Apptainer.
 
-ARG APPTAINER_VERSION=1.3.2
+ARG APPTAINER_VERSION=1.3.6
 ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb
 
 RUN cd /tmp \
@@ -154,11 +156,15 @@ RUN true \
 # and make it easy to access
 #     (https://github.com/jupyterhub/jupyter-rsession-proxy).
 
-ARG RSTUDIO_DEB=rstudio-server-2024.04.1-748-amd64.deb
+ARG RSTUDIO_DEB=rstudio-server-2024.12.0-467-amd64.deb
 
 USER root
 
 RUN true \
+    #
+    # Upgrade R.
+    #
+    && mamba install -y 'r-base~=4.4.2' \
     #
     # Install only the RStudio package.
     # R itself is already installed into the Conda environment.

notebooks/htc-minimal-notebook/Dockerfile

@@ -7,7 +7,7 @@
 # Copyright (C) HTCondor Team, Computer Sciences Dept, Univ of Wisconsin-Madison
 # Distributed under terms of the Apache Licence, Version 2.0.
 
-FROM quay.io/jupyter/minimal-notebook:hub-4.1.5
+FROM quay.io/jupyter/minimal-notebook:hub-5.2.1
 LABEL maintainer="[email protected]"
 USER root
 
@@ -26,8 +26,10 @@ RUN apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y curl git gnupg less man openjdk-21-jdk vim wget \
     #
-    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
-    && echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
+    # Install HTCondor.
+    #
+    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-24.x-Key | apt-key add - \
+    && echo "deb http://research.cs.wisc.edu/htcondor/repo/ubuntu/24.x noble main" > /etc/apt/sources.list.d/htcondor.list \
     && apt-get update -y \
     && apt-get install -y minihtcondor pelican pelican-osdf-compat \
     && apt-get clean -y \
@@ -99,7 +101,7 @@ RUN groupadd -r -g 990 sssd \
 ########################
 # Add support for Apptainer.
 
-ARG APPTAINER_VERSION=1.3.2
+ARG APPTAINER_VERSION=1.3.6
 ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb
 
 RUN cd /tmp \

notebooks/htc-pytorch-notebook/Dockerfile

@@ -7,7 +7,7 @@
 # Copyright (C) HTCondor Team, Computer Sciences Dept, Univ of Wisconsin-Madison
 # Distributed under terms of the Apache Licence, Version 2.0.
 
-FROM quay.io/jupyter/pytorch-notebook:cuda12-hub-4.1.5
+FROM quay.io/jupyter/pytorch-notebook:cuda12-hub-5.2.1
 LABEL maintainer="[email protected]"
 USER root
 
@@ -26,8 +26,10 @@ RUN apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y curl git gnupg less man openjdk-21-jdk vim wget \
     #
-    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
-    && echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
+    # Install HTCondor.
+    #
+    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-24.x-Key | apt-key add - \
+    && echo "deb http://research.cs.wisc.edu/htcondor/repo/ubuntu/24.x noble main" > /etc/apt/sources.list.d/htcondor.list \
     && apt-get update -y \
     && apt-get install -y minihtcondor pelican pelican-osdf-compat \
     && apt-get clean -y \
@@ -99,7 +101,7 @@ RUN groupadd -r -g 990 sssd \
 ########################
 # Add support for Apptainer.
 
-ARG APPTAINER_VERSION=1.3.2
+ARG APPTAINER_VERSION=1.3.6
 ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb
 
 RUN cd /tmp \

notebooks/htc-tensorflow-notebook/Dockerfile

@@ -7,7 +7,7 @@
 # Copyright (C) HTCondor Team, Computer Sciences Dept, Univ of Wisconsin-Madison
 # Distributed under terms of the Apache Licence, Version 2.0.
 
-FROM quay.io/jupyter/tensorflow-notebook:cuda-hub-4.1.5
+FROM quay.io/jupyter/tensorflow-notebook:cuda-hub-5.2.1
 LABEL maintainer="[email protected]"
 USER root
 
@@ -26,8 +26,10 @@ RUN apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y curl git gnupg less man openjdk-21-jdk vim wget \
     #
-    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
-    && echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
+    # Install HTCondor.
+    #
+    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-24.x-Key | apt-key add - \
+    && echo "deb http://research.cs.wisc.edu/htcondor/repo/ubuntu/24.x noble main" > /etc/apt/sources.list.d/htcondor.list \
     && apt-get update -y \
     && apt-get install -y minihtcondor pelican pelican-osdf-compat \
     && apt-get clean -y \
@@ -99,7 +101,7 @@ RUN groupadd -r -g 990 sssd \
 ########################
 # Add support for Apptainer.
 
-ARG APPTAINER_VERSION=1.3.2
+ARG APPTAINER_VERSION=1.3.6
 ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb
 
 RUN cd /tmp \

template/Dockerfile

@@ -26,8 +26,10 @@ RUN apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y curl git gnupg less man openjdk-21-jdk vim wget \
     #
-    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.x-Key | apt-key add - \
-    && echo "deb [arch=amd64] http://research.cs.wisc.edu/htcondor/repo/ubuntu/23.x jammy main" > /etc/apt/sources.list.d/htcondor.list \
+    # Install HTCondor.
+    #
+    && curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-24.x-Key | apt-key add - \
+    && echo "deb http://research.cs.wisc.edu/htcondor/repo/ubuntu/24.x noble main" > /etc/apt/sources.list.d/htcondor.list \
     && apt-get update -y \
     && apt-get install -y minihtcondor pelican pelican-osdf-compat \
     && apt-get clean -y \
@@ -99,7 +101,7 @@ RUN groupadd -r -g 990 sssd \
 ########################
 # Add support for Apptainer.
 
-ARG APPTAINER_VERSION=1.3.2
+ARG APPTAINER_VERSION=1.3.6
 ARG APPTAINER_DEB=apptainer_${APPTAINER_VERSION}_amd64.deb
 
 RUN cd /tmp \