allow different irods versions

Author: d-w-moore

irods/test/harness/README.txt

@@ -2,9 +2,13 @@ SAMPLE RUNS
 
 To build required images
 ------------------------
+Examples
 
-./build-docker.sh 
+    1) ./build-docker.sh 
+       DEFAULT: build  single-node system based on latest iRODS release
 
+    2) IRODS_PACKAGE_VERSION="4.2.12-1~bionic" NO_CACHE='1' ./build-docker.sh 
+       Build (ignoring docker cache) single-node system based on specified package version string.
 
 simple examples
 ---------------

irods/test/harness/build-docker.sh

@@ -10,6 +10,12 @@ DOCKER=docker
 for dockerfile in [0-9]*.Dockerfile; do 
     image_name=${dockerfile#[0-9]*_}
     image_name=${image_name%.Dockerfile}
-    $DOCKER build -f $dockerfile -t $image_name . ${IRODS_PACKAGE_VERSION:+"--build-arg=irods_package_version=$IRODS_PACKAGE_VERSION"} \
-                                                  ${NO_CACHE+"--no-cache"} || exit
+    if [ "$image_name" = "install-irods" ];then
+        package_version_option=${IRODS_PACKAGE_VERSION:+"--build-arg=irods_package_version=$IRODS_PACKAGE_VERSION"}
+    else
+        package_version_option=""
+    fi
+    $DOCKER build -f $dockerfile -t $image_name . $package_version_option \
+                                                  ${NO_CACHE+"--no-cache"} || 
+                                                  { STATUS=$?; echo "*** Failure while building [$image_name]"; exit $STATUS; }
 done