Improve docs

Author: rustprooflabs

DOCKER-RUN.md

@@ -12,6 +12,15 @@ Create directory for the `.osm.pbf` file and output `.sql` file.
 mkdir ~/pgosm-data
 ```
 
+
+Set environment variables for the temporary Postgres connection in Docker.
+
+```bash
+export POSTGRES_USER=postgres
+export POSTGRES_PASSWORD=mysecretpassword
+```
+
+
 Start the `pgosm` Docker container to make PostgreSQL/PostGIS available.
 This command exposes Postgres inside Docker on port 5433 and establishes links
 to the local directory created above (`~/pgosm-data`).
@@ -23,7 +32,7 @@ your the host machine's timezone, important when for archiving PBF & MD5 files b
 docker run --name pgosm -d --rm \
     -v ~/pgosm-data:/app/output \
     -v /etc/localtime:/etc/localtime:ro \
-    -e POSTGRES_PASSWORD=mysecretpassword \
+    -e POSTGRES_PASSWORD=$POSTGRES_PASSWORD \
     -p 5433:5432 -d rustprooflabs/pgosm-flex
 ```
 
@@ -40,7 +49,7 @@ The 3rd parameter tells the script the server has 8 GB RAM available for osm2pgs
 
 ```bash
 docker exec -it \
-    -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_USER=postgres \
+    -e POSTGRES_PASSWORD=$POSTGRES_PASSWORD -e POSTGRES_USER=$POSTGRES_USER \
     pgosm python3 docker/pgosm_flex.py \
     --layerset=run-all --ram=8 \
     --region=north-america/us \
@@ -62,31 +71,35 @@ Usage: pgosm_flex.py [OPTIONS]
   Logic to run PgOSM Flex within Docker.
 
 Options:
-  --layerset TEXT    Layer set from PgOSM Flex to load. e.g. run-all
-                     [default: (run-all);required]
-  --ram INTEGER      Amount of RAM in GB available on the server running this
-                     process.  [default: 8;required]
-  --region TEXT      Region name matching the filename for data sourced from
-                     Geofabrik. e.g. north-america/us  [default: (north-
-                     america/us);required]
-  --subregion TEXT   Sub-region name matching the filename for data sourced
-                     from Geofabrik. e.g. district-of-columbia  [default:
-                     (district-of-columbia)]
-  --srid INTEGER     SRID for data in PostGIS.
-  --pgosm-date TEXT  Date of the data in YYYY-MM-DD format. Set to historic
-                     date to load locally archived PBF/MD5 file, will fail if
-                     both files do not exist.
-  --skip-nested      When True, skips calculating nested admin polygons. Can
-                     be time consuming on large regions.
-  --data-only        When True, skips running Sqitch and importing QGIS
-                     Styles.
-  --debug            Enables additional log output
-  --basepath TEXT    Debugging option. Used when testing locally and not
-                     within Docker
-  --help             Show this message and exit.
+  --layerset TEXT     Layer set from PgOSM Flex to load. e.g. run-all
+                      [default: (run-all);required]
+  --ram INTEGER       Amount of RAM in GB available on the server running this
+                      process.  [default: 4;required]
+  --region TEXT       Region name matching the filename for data sourced from
+                      Geofabrik. e.g. north-america/us  [default: (north-
+                      america/us);required]
+  --subregion TEXT    Sub-region name matching the filename for data sourced
+                      from Geofabrik. e.g. district-of-columbia  [default:
+                      (district-of-columbia)]
+  --srid TEXT         SRID for data in PostGIS.
+  --pgosm-date TEXT   Date of the data in YYYY-MM-DD format. Set to historic
+                      date to load locally archived PBF/MD5 file, will fail if
+                      both files do not exist.
+  --language TEXT     Set default language in loaded OpenStreetMap data when
+                      available.  e.g. 'en' or 'kn'.
+  --schema-name TEXT  Coming soon
+  --skip-nested       When True, skips calculating nested admin polygons. Can
+                      be time consuming on large regions.
+  --data-only         When True, skips running Sqitch and importing QGIS
+                      Styles.
+  --debug             Enables additional log output
+  --basepath TEXT     Debugging option. Used when testing locally and not
+                      within Docker
+  --help              Show this message and exit.
 ```
 
-An example of running with all current options.
+An example of running with all current options, except `--basepath` which is only
+used during development.
 
 ```bash
 docker exec -it \