From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 May 2023 17:37:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4051'
X-Git-Tag: live~1473
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a209a72775787e181af01efc3214034cbe845055?hp=c97b932cdb1a663a2ee0d1bd0b505977b6173581

Merge remote-tracking branch 'upstream/pull/4051'
---

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 \