X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/255ce8708a4e9099f9a9eaa92278a40629a4d883..77797b21b0701654f9a7ee57aace7fa16214e9c2:/Dockerfile?ds=sidebyside

diff --git a/Dockerfile b/Dockerfile
index 8fcfa40e3..28c3a2ea6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,49 @@
-FROM ruby:2.5
+FROM ubuntu:22.04
 
-# Add yarn apt repository
-# https://classic.yarnpkg.com/en/docs/install#debian-stable
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+ENV DEBIAN_FRONTEND=noninteractive
 
-# Install system packages
-RUN apt-get update && \
-    apt-get install --no-install-recommends -y \
+# Install system packages then clean up to minimize image size
+RUN apt-get update \
+ && apt-get install --no-install-recommends -y \
       build-essential \
-      imagemagick \
+      curl \
+      default-jre-headless \
+      file \
+      git-core \
+      gpg-agent \
       libarchive-dev \
       libffi-dev \
-      libmagickwand-dev \
+      libgd-dev \
       libpq-dev \
       libsasl2-dev \
+      libvips-dev \
       libxml2-dev \
       libxslt1-dev \
+      libyaml-dev \
       locales \
-      nodejs \
-      osmosis \
-      phantomjs \
       postgresql-client \
+      ruby \
       ruby-dev \
-      yarn && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+      ruby-bundler \
+      software-properties-common \
+      tzdata \
+      unzip \
+      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 \
+      firefox-geckodriver \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+# Install compatible Osmosis to help users import sample data in a new instance
+RUN curl -OL https://github.com/openstreetmap/osmosis/releases/download/0.47.2/osmosis-0.47.2.tgz \
+ && tar -C /usr/local -xzf osmosis-0.47.2.tgz
+
+ENV DEBIAN_FRONTEND=dialog
 
 # Setup app location
 RUN mkdir -p /app
@@ -35,6 +53,7 @@ WORKDIR /app
 ADD Gemfile Gemfile.lock /app/
 RUN bundle install
 
-# Install NodeJS packages
+# Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/
-RUN yarn
+ADD bin/yarn /app/bin/
+RUN bundle exec bin/yarn install