From f36d159cbde518f023986a96e1cce805f8b8ada6 Mon Sep 17 00:00:00 2001
From: Vivian Rook <91909295+vivian-rook@users.noreply.github.com>
Date: Mon, 28 Aug 2023 09:37:34 -0400
Subject: [PATCH] Upgrade nodejs (#312)

* Upgrade nodejs

Bug: T341716

* auto update of  tag

* Remove unused terraform variables (#313)

Bug: T342443

---------

Co-authored-by: Github Action <auto@github.com>
---
 images/singleuser/Dockerfile           |  11 ++++-------
 images/singleuser/node/nodesource.gpg  | Bin 2206 -> 0 bytes
 images/singleuser/node/nodesource.list |   2 --
 paws/values.yaml                       |   2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 images/singleuser/node/nodesource.gpg
 delete mode 100644 images/singleuser/node/nodesource.list

diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile
index 5d176e6f..38769875 100644
--- a/images/singleuser/Dockerfile
+++ b/images/singleuser/Dockerfile
@@ -52,10 +52,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 \
@@ -66,12 +62,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 \
@@ -87,6 +81,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
deleted file mode 100644
index 4f3ec4ed793b397c15b9cba46c45cac6315dcc62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2206
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

diff --git a/images/singleuser/node/nodesource.list b/images/singleuser/node/nodesource.list
deleted file mode 100644
index 9d965d0f..00000000
--- a/images/singleuser/node/nodesource.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/nodesource.gpg] https://deb.nodesource.com/node_14.x focal main
-
diff --git a/paws/values.yaml b/paws/values.yaml
index 30d30f79..e1199013 100644
--- a/paws/values.yaml
+++ b/paws/values.yaml
@@ -282,7 +282,7 @@ jupyterhub:
     fsGid: 52771
     image:
       name: quay.io/wikimedia-paws-prod/singleuser
-      tag: pr-325 # singleuser tag managed by github actions
+      tag: pr-312 # singleuser tag managed by github actions
       pullPolicy: Always
     memory:
       guarantee: 1G