Improve options o run.sh, able to pass a configuration, e.g. ./run.sh -d 20 -c demo1

Author: pgleeson

.github/workflows/docker-image.yml

@@ -23,7 +23,10 @@ jobs:
       run: |
         docker -v
         docker images
-    - name: Run the Docker image
+    - name: Run the Docker image with the falling cube
+      run: |
+        ./run.sh -d 20 -c demo1
+    - name: Run the Docker image with a worm
       run: |
         ./run.sh
     - name: Info on generated files

.gitignore

@@ -4,3 +4,6 @@ output/C2*
 /output/siminfo.py
 /output/wor*
 /output/Sibernetic_*
+/output/test*
+/output/box
+/output/swim*

run.sh

@@ -1,21 +1,24 @@
 #!/bin/bash
 
+version=$(<VERSION) # Read version of Dockerfile from file VERSION
+
+
 #from: https://unix.stackexchange.com/a/129401
-while getopts ":d:p:" opt; do
-  case $opt in
+while getopts ":d:c:" opt; do
+  case "${opt}" in
     d) duration="$OPTARG"
     ;;
-    p) p_out="$OPTARG"
+    c) configuration="$OPTARG"
     ;;
-    \?) echo "Invalid option -$OPTARG" >&2
+    *) echo "Usage: $0 [-d duration] [-c configuration]" >&2
+       exit 1
     ;;
   esac
 done
 
 OW_OUT_DIR=/home/ow/shared
 HOST_OUT_DIR=$PWD
 
-version=$(<VERSION) # Read version of Dockerfile from file VERSION
 
 xhost +
 
@@ -26,10 +29,24 @@ else #Duration is set, use it.
     DURATION_PART="-e DURATION=$duration"
 fi
 
+echo 888
+if [ -z "$configuration" ]
+then #configuration is not set, don't use it
+    CONFIGURATION_PART=""
+else #Configuration is set, use it.
+    CONFIGURATION_PART="-e CONFIGURATION=$configuration"
+fi
+
+echo 77
+
+echo "Running Docker container for OpenWorm v${version}, configuration: ${configuration}, duration: ${duration}"
+
+
 docker run -d \
 --name openworm_$version \
 --device=/dev/dri:/dev/dri \
 -e DISPLAY=$DISPLAY \
+$CONFIGURATION_PART \
 $DURATION_PART \
 -e OW_OUT_DIR=$OW_OUT_DIR \
 -v /tmp/.X11-unix:/tmp/.X11-unix:rw \