X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86dbcb55f25219edc4f0aa93b209357e4cac0621..beeba305e9c55f70e855f1e83fc915b1ccb4206f:/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 33812d25d..28c3a2ea6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,45 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install system packages
+# Install system packages then clean up to minimize image size
 RUN apt-get update \
  && apt-get install --no-install-recommends -y \
       build-essential \
       curl \
       default-jre-headless \
       file \
-      firefox-geckodriver \
-      imagemagick \
+      git-core \
+      gpg-agent \
       libarchive-dev \
       libffi-dev \
       libgd-dev \
-      libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \
+      libvips-dev \
       libxml2-dev \
       libxslt1-dev \
+      libyaml-dev \
       locales \
-      nodejs \
       postgresql-client \
-      ruby2.7 \
-      ruby2.7-dev \
+      ruby \
+      ruby-dev \
+      ruby-bundler \
+      software-properties-common \
       tzdata \
       unzip \
-      yarnpkg \
+      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 current Osmosis
+# 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
 
@@ -42,9 +51,9 @@ WORKDIR /app
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/
-RUN gem install bundler \
- && bundle install
+RUN bundle install
 
-# Install NodeJS packages
+# Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/
-RUN yarnpkg install
+ADD bin/yarn /app/bin/
+RUN bundle exec bin/yarn install