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

[rails.git] / DOCKER.md

diff --git a/DOCKER.md b/DOCKER.md
index 870e3e26eacfe3329aea537249eb58436bd0d595..2df50bea91c657bc6e3ed1806fef2d9253a24754 100644 (file)
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -1,6 +1,6 @@
 # Using Docker and Docker Compose for Development and Testing
 
 # Using Docker and Docker Compose for Development and Testing
 

-These instructions are designed for setting up The Rails Port for development and testing using [Docker](https://www.docker.com/). This will allow you to install the OpenStreetMap application and all its dependencies in Docker images and then run them in containers, almost with a single command. You will need to install Docker and Docker Compose on your development machine:
+These instructions are designed for setting up `openstreetmap-website` for development and testing using [Docker](https://www.docker.com/). This will allow you to install the OpenStreetMap application and all its dependencies in Docker images and then run them in containers, almost with a single command. You will need to install Docker and Docker Compose on your development machine:

 
 - [Install Docker](https://docs.docker.com/install/)
 - [Install Docker Compose](https://docs.docker.com/compose/install/)
 
 - [Install Docker](https://docs.docker.com/install/)
 - [Install Docker Compose](https://docs.docker.com/compose/install/)


@@ -54,7 +54,7 @@ This will launch one Docker container for each 'service' specified in `docker-co
 
 Run the Rails database migrations:
 
 
 Run the Rails database migrations:
 

-    docker-compose run --rm web bundle exec rake db:migrate
+    docker-compose run --rm web bundle exec rails db:migrate

 
 ### Tests
 
 
 ### Tests