From 38a0c938aa9d72093adb4aaf977eefa569f6ca1c Mon Sep 17 00:00:00 2001 From: Brian Aydemir Date: Mon, 6 Jan 2025 12:06:29 -0600 Subject: [PATCH] Upgrade to JupyterHub 5.2.1 (Z2JH 4.0.0), R 4.4.2 --- BASE_IMAGES.txt | 8 ++++---- extras/rstudio/Dockerfile | 6 +++++- notebooks/htc-datascience-notebook/Dockerfile | 16 +++++++++++----- notebooks/htc-minimal-notebook/Dockerfile | 10 ++++++---- notebooks/htc-pytorch-notebook/Dockerfile | 10 ++++++---- notebooks/htc-tensorflow-notebook/Dockerfile | 10 ++++++---- template/Dockerfile | 8 +++++--- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/BASE_IMAGES.txt b/BASE_IMAGES.txt index e37a7f5..117065b 100644 --- a/BASE_IMAGES.txt +++ b/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 diff --git a/extras/rstudio/Dockerfile b/extras/rstudio/Dockerfile index 98fc1af..02fcd32 100644 --- a/extras/rstudio/Dockerfile +++ b/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. diff --git a/notebooks/htc-datascience-notebook/Dockerfile b/notebooks/htc-datascience-notebook/Dockerfile index 02e5030..5dc6618 100644 --- a/notebooks/htc-datascience-notebook/Dockerfile +++ b/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="chtc@cs.wisc.edu" 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. diff --git a/notebooks/htc-minimal-notebook/Dockerfile b/notebooks/htc-minimal-notebook/Dockerfile index de09dda..a7cbbdb 100644 --- a/notebooks/htc-minimal-notebook/Dockerfile +++ b/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="chtc@cs.wisc.edu" 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 \ diff --git a/notebooks/htc-pytorch-notebook/Dockerfile b/notebooks/htc-pytorch-notebook/Dockerfile index fc843b3..d09aff0 100644 --- a/notebooks/htc-pytorch-notebook/Dockerfile +++ b/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="chtc@cs.wisc.edu" 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 \ diff --git a/notebooks/htc-tensorflow-notebook/Dockerfile b/notebooks/htc-tensorflow-notebook/Dockerfile index 1dd2af3..027dfe3 100644 --- a/notebooks/htc-tensorflow-notebook/Dockerfile +++ b/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="chtc@cs.wisc.edu" 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 \ diff --git a/template/Dockerfile b/template/Dockerfile index b88ae3f..65be820 100644 --- a/template/Dockerfile +++ b/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 \