Merge pull request #553 from jbernal0019/master

Update chrisomatic to version 0.8.2
FNNDSC · Apr 16, 2024 · f95f05a · f95f05a
2 parents 1dc4fa7 + c20a830
commit f95f05a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/docker-compose_dev.yml b/docker-compose_dev.yml
@@ -15,7 +15,7 @@
 
 services:
   chrisomatic:
-    image: ghcr.io/fnndsc/chrisomatic:0.8.0a1
+    image: ghcr.io/fnndsc/chrisomatic:0.8.2
     volumes:
       - "./chrisomatic:/etc/chrisomatic:ro"
       - "/var/run/docker.sock:/var/run/docker.sock:rw"

diff --git a/docker-compose_noswift.yml b/docker-compose_noswift.yml
@@ -17,7 +17,7 @@
 
 services:
   chrisomatic:
-    image: ghcr.io/fnndsc/chrisomatic:0.8.0a1
+    image: ghcr.io/fnndsc/chrisomatic:0.8.2
     volumes:
       - "./chrisomatic:/etc/chrisomatic:ro"
       - "/var/run/docker.sock:/var/run/docker.sock:rw"

diff --git a/postscript.sh b/postscript.sh
@@ -16,10 +16,10 @@ G_SYNOPSIS="
     postscript.sh
 
   SYNOPSIS
-    postscript.sh [swift|filesystem]
+    postscript.sh [swift|fslink|filesystem]
 
   ARGS
-    [swift|filesystem]
+    [swift|fslink|filesystem]
     Denotes the storage environment.
 
   DESCRIPTION
@@ -33,8 +33,14 @@ fi
 
 STORAGE_ENV=$1
 
+if ! [[ "$STORAGE_ENV" =~ ^(swift|fslink|filesystem)$ ]]; then
+    echo "error: Invalid storage environment"
+    echo "$G_SYNOPSIS"
+    exit 1
+fi
+
 if [[ $STORAGE_ENV == 'swift' ]]; then
     docker compose -f docker-compose_dev.yml run --rm chrisomatic chrisomatic postscript.yml
-elif [[ $STORAGE_ENV == 'filesystem' ]]; then
+elif [[ $STORAGE_ENV =~ ^(fslink|filesystem)$ ]]; then
     docker compose -f docker-compose_noswift.yml run --rm chrisomatic chrisomatic postscript.yml
 fi