X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e19e58f059a39d3e9591a8d870f6a26695ca9c21..38b74c1c48521c3de988b774117d6f9febcf1c3f:/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 701f8dfcc..0bd5947be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:20.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 \
@@ -10,13 +10,12 @@ RUN apt-get update \
       default-jre-headless \
       file \
       firefox-geckodriver \
-      imagemagick \
       libarchive-dev \
       libffi-dev \
       libgd-dev \
-      libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \
+      libvips-dev \
       libxml2-dev \
       libxslt1-dev \
       locales \
@@ -30,7 +29,7 @@ RUN apt-get update \
  && 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
 
@@ -45,9 +44,7 @@ ADD Gemfile Gemfile.lock /app/
 RUN gem install bundler \
  && bundle install
 
-# Install NodeJS packages
+# Install NodeJS packages using yarn
 ADD package.json yarn.lock /app/
-RUN yarnpkg install
-
-# Create directories for traces and images
-RUN mkdir -pv /home/osm/traces /home/osm/images
+ADD bin/yarn /app/bin/
+RUN bundle exec bin/yarn install