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

[rails.git] / DOCKER.md

diff --git a/DOCKER.md b/DOCKER.md
index e2c2d2129cae324cd72ae24d95d50d5d33d80838..1def8b1cb4d729fc62ce2e0cdd030e94a7f961a5 100644 (file)
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -56,13 +56,7 @@ Run the Rails database migrations:
 
 Run the test suite by running:
 
 
 Run the test suite by running:
 

-    docker-compose run --rm web bundle exec rake test:db
-
-### Node Modules
-
-Install required front-end Node modules:
-
-    docker-compose run --rm web bundle exec rake yarn:install
+    docker-compose run --rm web bundle exec rails test:all

 
 ### Loading an OSM extract
 
 
 ### Loading an OSM extract
 


@@ -77,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" \