Fix docker volume mapping for --start-dsomm

Improved Usage documentation

Author: vbakke

README.md

@@ -12,7 +12,7 @@ Contributions that improve the DSOMM model are welcome. Please edit the source f
 
 ### Testing
 
-After making changes, generate a new `model.yaml` and use it in a local DSOMM application to verify there are no technical issues.
+After making changes, generate a new `model.yaml` and start a local DSOMM application to verify there are no technical issues. (See below.)
 
 
 ## Usage
@@ -40,6 +40,8 @@ To start a local DSOMM instance on http://localhost:8080, run:
 
   - `./generateDimensions.bash --start-dsomm`
 
+  This will down the latest DSOMM docker image and spin it up as a docker container.
+
 
 ### Test referenced URLs
 

yaml-generation/generateDimensions.bash

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # Usage:
-#    ./generateDimensions.bash --install     First time, install composer dependencies
-#    ./generateDimensions.bash               Generate model.yaml
-#    ./generateDimensions.bash --test-urls   Test URLs in implementations.yaml
+#    ./generateDimensions.bash                 Generate model.yaml
+#    ./generateDimensions.bash --test-urls     Test URLs in implementations.yaml
+#    ./generateDimensions.bash --start-dsomm   Run local DSOMM with generated model.yaml
 
 cd "$(dirname "$0")"/..
 
@@ -17,7 +17,8 @@ MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}:/app" wurstbrot/dso
 
 if [ "$1" = "--start-dsomm" ]; then
     echo "Starting local DSOMM application..."
-    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}/generated/model.yaml:/generated/model.yaml" -p 8080:8080 wurstbrot/dsomm
+    MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}/generated/model.yaml:/srv/assets/YAML/default/model.yaml" -p 8080:8080 wurstbrot/dsomm
+
 elif [ "$1" = "--test-urls" ]; then
     echo "Test URLs in implementations.yaml..."
     MSYS_NO_PATHCONV=1 $DOCKER_CMD run -e TEST_REFERENCED_URLS=true -ti --rm --volume "${PWD}:/app" wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php' | tee url-test-results.txt

yaml-generation/generateDimensions.bat

@@ -1,9 +1,9 @@
 @echo off
 
 REM Usage:
-REM    ./generateDimensions.bash --install     First time, install composer dependencies
-REM    ./generateDimensions.bash               Generate model.yaml
-REM    ./generateDimensions.bash --test-urls   Test URLs in implementations.yaml
+REM    ./generateDimensions.bash                 Generate model.yaml
+REM    ./generateDimensions.bash --test-urls     Test URLs in implementations.yaml
+REM    ./generateDimensions.bash --start-dsomm   Run local DSOMM with generated model.yaml
 
 setlocal
 REM Change working directory to the project root
@@ -19,7 +19,7 @@ echo Installing composer dependencies...
 
 if "%~1"=="--start-dsomm" (
     echo Start local DSOMM application...
-    %DOCKER_CMD% run -ti --rm --volume "%CD%/generated/model.yaml:/generated/model.yaml" -p 8080:8080 wurstbrot/dsomm
+    %DOCKER_CMD% run -ti --rm --volume "%CD%/generated/model.yaml:/srv/assets/YAML/default/model.yaml" -p 8080:8080 wurstbrot/dsomm
 
 ) else if "%~1"=="--test-urls" (
     echo Test URLs in implementations.yaml...