Doc tweaks

Author: azconger

README.md

@@ -19,14 +19,44 @@ brew install mysql
 
 ## Using docker-compose
 
+### All-in-One vuln_django
+
+The default Docker Compose configuration builds an all-in-one container, including vuln_django, an Nginx front-end, and SQLite.
+
 Build and run in foreground:
-`docker-compose up --build`
+```shell script
+docker-compose up --build
+```
 
 Run as a daemon:
-`docker-compose up -d`
+```shell script
+docker-compose up -d
+```
 
 Build:
-`docker-compose build`
+```shell script
+docker-compose build
+```
+
+### Microservice vuln_django
+The `docker-micro-pg` Docker Compose configuration builds a microservice version of vuln_django, with separate containers running an Nginx front-end, and PostgreSQL database. 
+
+Build, run, and run data migrations:
+```shell script
+docker-compose -f docker-micro-pg.yml build
+docker-compose -f docker-micro-pg.yml up --detach
+./scripts/migrations.sh
+```
+
+To bring the microservice stack up with migrations, a Django admin user, and seed data, run:
+```shell script
+./scripts/build-and-run.sh
+```
+
+To do that plus run HawkScan against it, run:
+```shell script
+./scripts/build-and-scan.sh
+```
 
 ## Using Dockerfile
 

scripts/build-and-prep.sh scripts/build-and-run.sh

@@ -4,7 +4,7 @@ set -ex
 source $(dirname $0)/common.sh
 
 # Build vuln-django and run it with Nginx and PostgreSQL
-$(dirname $0)/build-and-prep.sh
+$(dirname $0)/build-and-run.sh
 
 # Run HawkScan against the app
 docker-compose -f docker-micro-pg.yml -f docker-hawkscan.yml up --abort-on-container-exit

scripts/build-and-scan.sh

@@ -4,7 +4,7 @@ set -ex
 
 EXEC_CMD='docker-compose --file docker-micro-pg.yml exec vuln-django'
 
-echo Waiting for database to become available...
+echo Wait for database to become available...
 while ! ${EXEC_CMD} bash -c 'nc -z "${SQL_HOST}" "${SQL_PORT}"'; do
   sleep 0.5
 done