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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 28c3a2ea64cc6b664b777cd129ad0a2fdde114d2..1c5638275083f50bfce7ca303f7a9014ca82bee7 100644 (file)
--- 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 \