Noted yarn step in Docker instructions

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 8fcfa40e32d4165c994baa892597791277d2a7ca..90ca79015e2aeabf7fead1c97a025db09cafbcd4 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:2.7
 
 # Add yarn apt repository
 # https://classic.yarnpkg.com/en/docs/install#debian-stable
@@ -19,7 +19,7 @@ RUN apt-get update && \
       libxslt1-dev \
       locales \
       nodejs \
-      osmosis \
+      default-jre-headless \
       phantomjs \
       postgresql-client \
       ruby-dev \
@@ -27,6 +27,10 @@ RUN apt-get update && \
     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
+
 # Setup app location
 RUN mkdir -p /app
 WORKDIR /app
@@ -37,4 +41,4 @@ RUN bundle install
 
 # Install NodeJS packages
 ADD package.json yarn.lock /app/
-RUN yarn
+RUN yarn install