From 27340d65cde219627f721da9ed0f46328fd9b06f Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 31 May 2023 15:46:18 +0100
Subject: [PATCH] Use default version of node, but use npm to install yarn

* Node 12 is sufficient for now, and aligns with INSTALL.md and vagrant
* Upstream yarnpkg is completely broken, see
  https://bugs.launchpad.net/ubuntu/+source/node-yarnpkg/+bug/2003697

Refs #4048
---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 78be28838..c85a64046 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,11 +25,10 @@ RUN apt-get update \
       software-properties-common \
       tzdata \
       unzip \
- && curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && add-apt-repository -y -U https://deb.nodesource.com/node_18.x \
- && apt-get install --no-install-recommends -y \
       nodejs \
+      npm \
  && npm install --global yarn \
+ # We can't use snap packages for firefox inside a container, so we need to get firefox+geckodriver elsewhere
  && add-apt-repository -y ppa:mozillateam/ppa \
  && echo "Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox \
  && apt-get install --no-install-recommends -y \
-- 
2.39.5