ENH: Reorganize docker files to support testing against multiple ITK version

This commit extends Docker support allowing to have a Dockerfile for
each version of ITK.

Each Dockerfile is expected to be in a directory of this form:

  test/Docker-<IDENTIFIER>

containing files "Dockerfile", "build.sh" and "run.sh".

<IDENTIFIER> is a free form string allowing to loosely describe the
the properties of the associated ITK build tree. This identifier will be
used to specify the docker image tag in order to differenciate images
regarding to their ITK build tree version. (It corresponds to
variable 'image_tag' in build.sh)

test/Docker-<IDENTIFIER>/build.sh: The ITK build tree is contained
in the docker container that can be generated using the "build.sh"
script and the associated "Dockerfile".

test/Docker/test.sh: This script will

  (a) build SlicerExecutionModel against the ITK build tree available in
      the container obtained using "build.sh"

  (b) run SlicerExecutionModel tests

  Note that results of step (a) and (b) are both submitted to CDash.

test/Docker-<IDENTIFIER>/run.sh: Allow to configure, build and test
SlicerExecutionModel inside the docker container.

Co-authored-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

Author: LucasGandel

test/Docker/Dockerfile renamed to test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile

@@ -3,26 +3,17 @@ MAINTAINER Insight Software Consortium <community@itk.org>
 
 RUN apt-get update && apt-get install -y \
   build-essential \
-  curl \
   cmake \
   git \
-  libexpat1-dev \
-  libhdf5-dev \
-  libjpeg-dev \
-  libpng12-dev \
-  libpython3-dev \
-  libtiff5-dev \
   python \
   ninja-build \
   wget \
-  vim \
-  zlib1g-dev
+  vim
 
 RUN mkdir -p /usr/src/SlicerExecutionModel-build
 WORKDIR /usr/src
 
-# 2015-09-24
-ENV ITK_GIT_TAG cf05d9658da5f27c3ad6652028f563b50cf194b2
+ENV ITK_GIT_TAG v4.8.0
 RUN git clone git://itk.org/ITK.git && \
   cd ITK && \
   git checkout ${ITK_GIT_TAG} && \
@@ -38,10 +29,10 @@ RUN git clone git://itk.org/ITK.git && \
     -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
     -DITK_LEGACY_REMOVE:BOOL=ON \
     -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \
-    -DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
+    -DITK_USE_SYSTEM_LIBRARIES:BOOL=OFF \
     -DModule_ITKCommon:BOOL=ON \
     -DModule_ITKIOXML:BOOL=ON \
+    -DModule_ITKExpat:BOOL=ON \
     ../ITK && \
   ninja install && \
   rm -rf ITK ITK-build
-

test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/build.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Extract tag
+script_dir="`cd $(dirname $0); pwd`"
+image_tag="`echo $script_dir | rev | cut -d'/' -f 1 | rev | cut -d'-' -f 2-`"
+# Run common build script
+$script_dir/../Docker/build.sh $image_tag $script_dir

test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/run.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Extract tag
+script_dir="`cd $(dirname $0); pwd`"
+image_tag="`echo $script_dir | rev | cut -d'/' -f 1 | rev | cut -d'-' -f 2-`"
+# Run common run script
+$script_dir/../Docker/run.sh $image_tag

test/Docker/build.sh

@@ -1,5 +1,19 @@
 #!/bin/sh
 
-script_dir="`cd $(dirname $0); pwd`"
+die() {
+  echo "Error: $@" 1>&2
+  exit 1;
+}
 
-docker build -t slicer/slicerexecutionmodel $script_dir
+if [ ! $1 ];
+then
+  die "Empty Image Tag "
+fi
+
+if [ ! $2 ];
+then
+  die "Empty Path to Dockerfile "
+fi
+
+lower_case_tag="`echo $1 | tr "[:upper:]" "[:lower:]" `"
+docker build -t slicer/slicerexecutionmodel:$lower_case_tag $2

test/Docker/run.sh

@@ -2,8 +2,15 @@
 
 script_dir="`cd $(dirname $0); pwd`"
 
+if [ ! $1 ];
+then
+  die "Empty Image Tag "
+fi
+
+lower_case_tag="`echo $1 | tr "[:upper:]" "[:lower:]" `"
+
 docker run \
   --rm \
   -v $script_dir/../..:/usr/src/SlicerExecutionModel \
-    slicer/slicerexecutionmodel \
+    slicer/slicerexecutionmodel:$lower_case_tag \
       /usr/src/SlicerExecutionModel/test/Docker/test.sh