From a08b64d4fb1d2f469fb9e48d217c3621cc7247cb Mon Sep 17 00:00:00 2001
From: Vivian Rook <vrook@wikimedia.org>
Date: Tue, 28 May 2024 10:46:25 -0400
Subject: [PATCH] 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 e12a0743..62a4fdc4 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.2
 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