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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index f3c56e1615c922c53a91dd5aaae86ea9a51c0d64..1c5638275083f50bfce7ca303f7a9014ca82bee7 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update \
       curl \
       default-jre-headless \
       file \
       curl \
       default-jre-headless \
       file \

+      git-core \

       gpg-agent \
       libarchive-dev \
       libffi-dev \
       gpg-agent \
       libarchive-dev \
       libffi-dev \


@@ -18,6 +19,7 @@ RUN apt-get update \
       libvips-dev \
       libxml2-dev \
       libxslt1-dev \
       libvips-dev \
       libxml2-dev \
       libxslt1-dev \

+      libyaml-dev \

       locales \
       postgresql-client \
       ruby \
       locales \
       postgresql-client \
       ruby \


@@ -25,10 +27,14 @@ RUN apt-get update \
       ruby-bundler \
       software-properties-common \
       tzdata \
       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 \
  # 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 \