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

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 701f8dfccc6b062afe37ffff6ee10969dcfb2aaf..c85a6404606d99bd8ef4a416f6eed2a7c6319881 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,42 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04

 
 ENV DEBIAN_FRONTEND=noninteractive
 
 
 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 \
 RUN apt-get update \
  && apt-get install --no-install-recommends -y \
       build-essential \
       curl \
       default-jre-headless \
       file \

-      firefox-geckodriver \
-      imagemagick \
+      gpg-agent \

       libarchive-dev \
       libffi-dev \
       libgd-dev \
       libarchive-dev \
       libffi-dev \
       libgd-dev \

-      libmagickwand-dev \

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

+      libvips-dev \

       libxml2-dev \
       libxslt1-dev \
       locales \
       libxml2-dev \
       libxslt1-dev \
       locales \

-      nodejs \

       postgresql-client \
       postgresql-client \

-      ruby2.7 \
-      ruby2.7-dev \
+      ruby3.0 \
+      ruby3.0-dev \
+      software-properties-common \

       tzdata \
       unzip \
       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/*
 
  && 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
 
 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 +51,7 @@ ADD Gemfile Gemfile.lock /app/
 RUN gem install bundler \
  && bundle install
 
 RUN gem install bundler \
  && bundle install
 

-# Install NodeJS packages
+# Install NodeJS packages using yarn

 ADD package.json yarn.lock /app/
 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