From: Michal Migurski <mike@teczno.com>
Date: Thu, 4 Feb 2021 16:24:41 +0000 (-0800)
Subject: Added explanatory notes and comments
X-Git-Tag: live~2202^2~1
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7be797cbe264f6d06678396b4edab14cb83eed77

Added explanatory notes and comments
---

diff --git a/DOCKER.md b/DOCKER.md
index d5a673bbe..ce0430939 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -71,6 +71,7 @@ You can now use Docker to load this extract into your local Docker-based OSM ins
     docker-compose run --rm web osmosis \
         -verbose    \
         --read-pbf district-of-columbia-latest.osm.pbf \
+        --log-progress \
         --write-apidb \
             host="db" \
             database="openstreetmap" \
diff --git a/Dockerfile b/Dockerfile
index 33812d25d..e8ff01387 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:20.04
 
 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 \
@@ -30,7 +30,7 @@ RUN apt-get update \
  && 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
 
@@ -45,6 +45,7 @@ ADD Gemfile Gemfile.lock /app/
 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