From 8baebaba2f85df17d67f0d4f10224e1a9051d893 Mon Sep 17 00:00:00 2001
From: Michal Migurski <mike@teczno.com>
Date: Thu, 17 Dec 2020 22:45:25 -0800
Subject: [PATCH] Migrated from ruby:2.7 Docker image to ubuntu:20.04

---
 Dockerfile         | 25 ++++++++++++++-----------
 docker-compose.yml |  5 +++++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 90ca79015..6b9110e92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ruby:2.7
+FROM ubuntu:20.04
 
-# Add yarn apt repository
-# https://classic.yarnpkg.com/en/docs/install#debian-stable
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Install system packages
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
       build-essential \
+      curl \
+      default-jre-headless \
+      firefox-geckodriver \
       imagemagick \
       libarchive-dev \
       libffi-dev \
@@ -19,11 +19,11 @@ RUN apt-get update && \
       libxslt1-dev \
       locales \
       nodejs \
-      default-jre-headless \
-      phantomjs \
       postgresql-client \
-      ruby-dev \
-      yarn && \
+      ruby2.7 \
+      ruby2.7-dev \
+      tzdata \
+      yarnpkg && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -31,14 +31,17 @@ RUN apt-get update && \
 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
+
 # Setup app location
 RUN mkdir -p /app
 WORKDIR /app
 
 # Install Ruby packages
 ADD Gemfile Gemfile.lock /app/
-RUN bundle install
+RUN gem install bundler && \
+    bundle install
 
 # Install NodeJS packages
 ADD package.json yarn.lock /app/
-RUN yarn install
+RUN yarnpkg install
diff --git a/docker-compose.yml b/docker-compose.yml
index dbdd62731..9719f0e7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,13 @@ services:
       context: .
     volumes:
       - .:/app
+      # don't mount tmp directory (https://github.com/Shopify/bootsnap/issues/177)
+      - /app/tmp
     ports:
       - "3000:3000"
+    environment:
+      # https://github.com/Shopify/bootsnap/issues/262
+      ENABLE_BOOTSNAP: 'false'
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     depends_on:
       - db
-- 
2.43.2