From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 Jul 2024 17:40:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4992'
X-Git-Tag: live~1055
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/05e533571649f846ee09e6e81431b5fc5fe3c01a?hp=87d55912e246153239e5f4f24dd635a110a53119

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

diff --git a/Dockerfile b/Dockerfile
index 28c3a2ea6..1c5638275 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,10 +27,14 @@ RUN apt-get update \
       ruby-bundler \
       software-properties-common \
       tzdata \
-      unzip \
-      nodejs \
-      npm \
- && npm install --global yarn \
+      unzip
+
+# Install Node.js 18 and npm
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+ && apt-get install -y nodejs
+
+# Install yarn globally
+RUN 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 \