Merge remote-tracking branch 'upstream/pull/3214'

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 6b9110e92941d84ae599b8b92aaf5f65d8830e59..e8ff013870493ccee62d27b8730a8f5102707e18 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,16 +2,18 @@ FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 
 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 \
       build-essential \
       curl \
       default-jre-headless \

+      file \

       firefox-geckodriver \
       imagemagick \
       libarchive-dev \
       libffi-dev \
       firefox-geckodriver \
       imagemagick \
       libarchive-dev \
       libffi-dev \

+      libgd-dev \

       libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \
       libmagickwand-dev \
       libpq-dev \
       libsasl2-dev \


@@ -23,13 +25,14 @@ RUN apt-get update && \
       ruby2.7 \
       ruby2.7-dev \
       tzdata \
       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
 
 
 ENV DEBIAN_FRONTEND=dialog
 


@@ -39,9 +42,10 @@ 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 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
 ADD package.json yarn.lock /app/
 RUN yarnpkg install