X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8baebaba2f85df17d67f0d4f10224e1a9051d893..707ebddbb5da007406ae04e9a418882fc278be01:/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 6b9110e92..40ad730cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,16 +2,18 @@ FROM ubuntu:20.04
 
 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 \
       curl \
       default-jre-headless \
+      file \
       firefox-geckodriver \
       imagemagick \
       libarchive-dev \
       libffi-dev \
+      libgd-dev \
       libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \
@@ -23,13 +25,14 @@ RUN apt-get update && \
       ruby2.7 \
       ruby2.7-dev \
       tzdata \
-      yarnpkg && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+      unzip \
+      yarnpkg \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
 
-# Install current Osmosis
-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
+# 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
 
@@ -39,9 +42,10 @@ WORKDIR /app
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/
-RUN gem install bundler && \
-    bundle install
+RUN gem install bundler \
+ && bundle install
 
-# Install NodeJS packages
+# Install NodeJS packages using yarnpkg
+# `bundle exec rake yarn:install` will not work
 ADD package.json yarn.lock /app/
-RUN yarnpkg install
+RUN yarnpkg --ignore-engines install