Merge branch 'pull/5142'

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 78be28838980e2d561641071d48659fd2ac40ddd..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,18 +19,23 @@ RUN apt-get update \
       libvips-dev \
       libxml2-dev \
       libxslt1-dev \
       libvips-dev \
       libxml2-dev \
       libxslt1-dev \

+      libyaml-dev \

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

-      ruby3.0 \
-      ruby3.0-dev \
+      ruby \
+      ruby-dev \
+      ruby-bundler \

       software-properties-common \
       tzdata \
       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 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 \
  && apt-get install --no-install-recommends -y \
  && 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 \


@@ -49,8 +55,7 @@ WORKDIR /app
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/

-RUN gem install bundler \
- && bundle install
+RUN bundle install

 
 # Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/
 
 # Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/