Merge branch 'main' into T121478

toolforge · Aug 28, 2023 · 5bf6b24 · 5bf6b24
2 parents 8b49869 + f36d159
commit 5bf6b24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile
@@ -51,10 +51,6 @@ RUN pip install --prefix=/srv/paws --no-cache-dir \
 
 USER root
 
-# Setup nodesource, because node on Ubuntu is far too old to be useful
-ADD node/nodesource.gpg /etc/apt/trusted.gpg.d/nodesource.gpg
-ADD node/nodesource.list /etc/apt/sources.list.d/nodesource.list
-
 # Base building utilities that'll always be required, probably
 RUN apt-get update && \
     apt-get install --yes \
@@ -65,12 +61,10 @@ RUN apt-get update && \
         gcc \
         apt-transport-https
 
-
 RUN apt-get update --yes && \
     apt-get install --yes \
         python3-dev \
-        openjdk-11-jdk \
-        nodejs
+        openjdk-11-jdk
 
 # Utilities
 RUN apt-get install --yes \
@@ -86,6 +80,9 @@ RUN apt-get install --yes \
         mariadb-client \
         unrar
 
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+RUN apt-get install -y nodejs
+
 # pyaudio
 RUN apt-get install --yes \
         portaudio19-dev

diff --git a/images/singleuser/node/nodesource.gpg b/images/singleuser/node/nodesource.gpg
diff --git a/images/singleuser/node/nodesource.list b/images/singleuser/node/nodesource.list