From 5b6af9cced6b574ed815c1452251b136a8e037f8 Mon Sep 17 00:00:00 2001 From: Vivian Rook Date: Tue, 28 May 2024 10:46:25 -0400 Subject: [PATCH 1/2] update to ubuntu 24.04 Bug: T366058 --- images/singleuser/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile index 5f01485c..62762f23 100644 --- a/images/singleuser/Dockerfile +++ b/images/singleuser/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV PYWIKIBOT_VERSION=9.1.3 ENV EDITOR=/bin/nano @@ -14,11 +14,9 @@ ENV NB_USER tools.paws ENV NB_UID 52771 ENV HOME /home/paws -RUN adduser --disabled-password \ - --gecos "Default user" \ +RUN useradd \ --uid ${NB_UID} \ - --home ${HOME} \ - --force-badname \ + --home-dir ${HOME} \ ${NB_USER} WORKDIR ${HOME} @@ -116,7 +114,7 @@ RUN apt-get update --yes && \ libssl-dev # Install rstudio-server -ENV RSTUDIO_SERVER_URL https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2023.12.1-402-amd64.deb +ENV RSTUDIO_SERVER_URL https://download2.rstudio.org/server/noble/amd64/rstudio-server-2023.12.1-402-amd64.deb RUN curl --silent --location --fail ${RSTUDIO_SERVER_URL} > /tmp/rstudio-server.deb RUN gdebi -n /tmp/rstudio-server.deb && rm /tmp/rstudio-server.deb From 3269e348cb42e32478991b83b826550f0c929623 Mon Sep 17 00:00:00 2001 From: Github Action Date: Tue, 28 May 2024 17:38:47 +0000 Subject: [PATCH 2/2] auto update of tag --- images/singleuser/Dockerfile | 9 +++------ images/singleuser/r/Rprofile.site | 2 +- images/singleuser/r/cran.list | 2 +- images/singleuser/r/rsession.conf | 2 +- images/singleuser/requirements.txt | 1 - paws/values.yaml | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile index 62762f23..77b0eec6 100644 --- a/images/singleuser/Dockerfile +++ b/images/singleuser/Dockerfile @@ -114,7 +114,7 @@ RUN apt-get update --yes && \ libssl-dev # Install rstudio-server -ENV RSTUDIO_SERVER_URL https://download2.rstudio.org/server/noble/amd64/rstudio-server-2023.12.1-402-amd64.deb +ENV RSTUDIO_SERVER_URL https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2023.12.1-402-amd64.deb RUN curl --silent --location --fail ${RSTUDIO_SERVER_URL} > /tmp/rstudio-server.deb RUN gdebi -n /tmp/rstudio-server.deb && rm /tmp/rstudio-server.deb @@ -142,6 +142,7 @@ COPY r/Rprofile.site /usr/lib/R/etc/Rprofile.site # RStudio needs its own config COPY r/rsession.conf /etc/rstudio/rsession.conf +USER root # Install the R Kernel RUN r -e "install.packages('IRkernel', version='1.3.2')" && \ r -e "IRkernel::installspec(prefix='${VENV_DIR}')" && \ @@ -226,12 +227,8 @@ RUN /tmp/install-sql-tool ## Done installing sql access tool -RUN pip install --no-cache-dir \ - jupyterlab-link-share>=0.2.4 \ -# 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 pip install bash_kernel RUN python -m bash_kernel.install --sys-prefix # Install mass amount of python libraries! diff --git a/images/singleuser/r/Rprofile.site b/images/singleuser/r/Rprofile.site index 961f50b9..1049ce40 100644 --- a/images/singleuser/r/Rprofile.site +++ b/images/singleuser/r/Rprofile.site @@ -1,7 +1,7 @@ # Use RStudio's CRAN mirror to get binary packages # 'latest' just means it has all available versions. # We can specify version numbers in devtools::install_version -options(repos = c(CRAN = "https://packagemanager.rstudio.com/all/__linux__/jammy/latest")) +options(repos = c(CRAN = "https://packagemanager.rstudio.com/all/__linux__/noble/latest")) # RStudio's CRAN mirror needs this to figure out which binary package to serve. # If not set properly, it will just serve up source packages diff --git a/images/singleuser/r/cran.list b/images/singleuser/r/cran.list index f51c6054..53120dde 100644 --- a/images/singleuser/r/cran.list +++ b/images/singleuser/r/cran.list @@ -1 +1 @@ -deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/cran.gpg] https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/ +deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/cran.gpg] https://cloud.r-project.org/bin/linux/ubuntu noble-cran40/ diff --git a/images/singleuser/r/rsession.conf b/images/singleuser/r/rsession.conf index 1f82b6b5..3cac92aa 100644 --- a/images/singleuser/r/rsession.conf +++ b/images/singleuser/r/rsession.conf @@ -1,2 +1,2 @@ # Use binary packages! -r-cran-repos=https://packagemanager.rstudio.com/all/__linux__/jammy/latest +r-cran-repos=https://packagemanager.rstudio.com/all/__linux__/noble/latest diff --git a/images/singleuser/requirements.txt b/images/singleuser/requirements.txt index 1b44beb7..aa9c4e7f 100644 --- a/images/singleuser/requirements.txt +++ b/images/singleuser/requirements.txt @@ -27,7 +27,6 @@ streamlit pandas scipy scikit-learn -scikit-neuralnetwork # Scraping lxml diff --git a/paws/values.yaml b/paws/values.yaml index a812dcb7..3987e714 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -280,7 +280,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-431 # singleuser tag managed by github actions + tag: pr-417 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G