Added explanatory notes and comments

diff --git a/DOCKER.md b/DOCKER.md
index d5a673bbeae4e496304fcb57fd1270de260ddb24..ce04309392f88d97391924c4a47c0b769c41e998 100644 (file)
--- 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 \
     docker-compose run --rm web osmosis \
         -verbose    \
         --read-pbf district-of-columbia-latest.osm.pbf \

+        --log-progress \

         --write-apidb \
             host="db" \
             database="openstreetmap" \
         --write-apidb \
             host="db" \
             database="openstreetmap" \

diff --git a/Dockerfile b/Dockerfile
index 33812d25d6d22a70308ec64eb5803b7ead6d367a..e8ff013870493ccee62d27b8730a8f5102707e18 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:20.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 \
 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/*
 
  && 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,6 +45,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 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