diff --git a/.github/workflows/docker-jupyter-hub.yml b/.github/workflows/docker-jupyter-hub.yml index 1313ee4..b9bb5d3 100755 --- a/.github/workflows/docker-jupyter-hub.yml +++ b/.github/workflows/docker-jupyter-hub.yml @@ -24,9 +24,9 @@ jobs: platform: [amd64, arm64] include: - platform: amd64 - runner: ubuntu-22.04 + runner: ubuntu-24.04 - platform: arm64 - runner: ubuntu-22.04 + runner: ubuntu-24.04 env: working-directory: ./ diff --git a/.github/workflows/docker-jupyter-singleuser-gpu.yml b/.github/workflows/docker-jupyter-singleuser-gpu.yml index 5404ae1..2734083 100755 --- a/.github/workflows/docker-jupyter-singleuser-gpu.yml +++ b/.github/workflows/docker-jupyter-singleuser-gpu.yml @@ -17,7 +17,7 @@ jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: working-directory: ./ diff --git a/.github/workflows/docker-jupyter-singleuser.yml b/.github/workflows/docker-jupyter-singleuser.yml index 5b415c8..3252e74 100755 --- a/.github/workflows/docker-jupyter-singleuser.yml +++ b/.github/workflows/docker-jupyter-singleuser.yml @@ -24,9 +24,9 @@ jobs: platform: [amd64, arm64] include: - platform: amd64 - runner: ubuntu-22.04 + runner: ubuntu-24.04 - platform: arm64 - runner: ubuntu-22.04 + runner: ubuntu-24.04 env: working-directory: ./ diff --git a/Dockerfile_hub b/Dockerfile_hub index 09d6f8a..a9dff01 100644 --- a/Dockerfile_hub +++ b/Dockerfile_hub @@ -34,25 +34,25 @@ RUN apt-add-repository multiverse && \ # Add latest ubuntu repos to sources.list # add arch RUN if [ "${CPU_ARCHITECTURE}" = "amd64" ]; then \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ elif [ "${CPU_ARCHITECTURE}" = "arm64" ]; then \ - echo "deb [arch=arm64] http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ else \ echo "No valid CPU_ARCHITECTURE specified"; \ fi diff --git a/Dockerfile_singleuser b/Dockerfile_singleuser index 151300f..385164d 100644 --- a/Dockerfile_singleuser +++ b/Dockerfile_singleuser @@ -34,25 +34,25 @@ RUN apt-add-repository multiverse && \ # Add latest ubuntu repos to sources.list # add arch RUN if [ "${CPU_ARCHITECTURE}" = "amd64" ]; then \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ elif [ "${CPU_ARCHITECTURE}" = "arm64" ]; then \ - echo "deb [arch=arm64] http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ else \ echo "No valid CPU_ARCHITECTURE specified"; \ fi @@ -119,8 +119,8 @@ RUN apt-get update && apt-get upgrade -y # Microsoft repos RUN curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/packages.microsoft.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list >> /etc/apt/sources.list.d/mssql-release.list -RUN echo "deb [arch=arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" | tee -a /etc/apt/sources.list +RUN curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list >> /etc/apt/sources.list.d/mssql-release.list +RUN echo "deb [arch=arm64] https://packages.microsoft.com/ubuntu/24.04/prod noble main" | tee -a /etc/apt/sources.list # install remaining packages RUN apt-get update && apt-get upgrade -y diff --git a/Dockerfile_singleuser_gpu b/Dockerfile_singleuser_gpu index 983db79..b726d17 100644 --- a/Dockerfile_singleuser_gpu +++ b/Dockerfile_singleuser_gpu @@ -40,25 +40,25 @@ RUN apt-add-repository multiverse && \ # Add latest ubuntu repos to sources.list RUN if [ "${CPU_ARCHITECTURE}" = "amd64" ]; then \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb-src http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb-src http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ elif [ "${CPU_ARCHITECTURE}" = "arm64" ]; then \ - echo "deb [arch=arm64] http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://archive.canonical.com/ubuntu/ jammy partner" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ - echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://archive.canonical.com/ubuntu/ noble partner" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ + echo "deb-src [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse" | tee -a /etc/apt/sources.list ; \ else \ echo "No valid CPU_ARCHITECTURE specified"; \ fi @@ -152,8 +152,8 @@ RUN apt-get install -y nvidia-docker2 nvidia-container-toolkit # Microsoft repos RUN curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/packages.microsoft.gpg -RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list >> /etc/apt/sources.list.d/mssql-release.list -RUN echo "deb [arch=arm64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" | tee -a /etc/apt/sources.list +RUN curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list >> /etc/apt/sources.list.d/mssql-release.list +RUN echo "deb [arch=arm64] https://packages.microsoft.com/ubuntu/24.04/prod noble main" | tee -a /etc/apt/sources.list # install remaining packages RUN apt-get update && apt-get upgrade -y