Merge pull request Slicer#96 from Slicer/simplify-docker-image-management

docker: Remove build and run script, and use Makefile instead

Author: jcfr

README.md

@@ -57,7 +57,7 @@ head of the branch. If you add new commits onto the branch, those will also auto
 be run through the CI process. The status of the CI process (passing, failing, or in progress) will
 be displayed directly in the PR page in GitHub.
 
-The CircleCI build will run according to the [circle.yml file](circle.yml),
+The CircleCI build will run according to the [.circleci/config.yml](.circleci/config.yml) file,
 which is useful as an example for how to set up your own environment for testing.
 
 Your test results will be posted on [SlicerExecutionModel's dashboard](http://slicer.cdash.org/index.php?project=SlicerExecutionModel).
@@ -71,7 +71,7 @@ With each PR, SlicerExecutionModel is built and tested against multiple version
 environment is made available in docker images:
 
 * Each environment is described in a ``Dockerfile`` found in a ``Docker-ITK-vX.Y.Z`` subdirectory of [test](./test).
-* Testing using a given environment is enabled updating the [circle.yml](circle.yml) file.
+* Testing using a given environment is enabled updating the [.circleci/config.yml](.circleci/config.yml) file.
 * Before enabling an environment, associated docker image has to be (1) built locally running the `build.sh` script
   and (2) manually pushed to [dockerhub](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags/).
 

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

@@ -0,0 +1,59 @@
+#
+# Parameters
+#
+
+# Name of the docker executable
+DOCKER = docker
+
+# DockerHub organization and repository to pull the images from
+ORG = slicer
+REPO = slicerexecutionmodel
+
+DIRECTORIES = Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF  Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF
+
+# On CircleCI, do not attempt to delete container
+# See https://circleci.com/docs/docker-btrfs-error/
+RM = --rm
+ifeq ("$(CIRCLECI)", "true")
+	RM =
+endif
+
+#
+# images: This target builds all IMAGES (because it is the first one, it is built by default)
+#
+images: $(DIRECTORIES)
+
+#
+# display
+#
+display_images:
+	for directory in $(DIRECTORIES); do echo $$directory | rev | cut -d'/' -f 1 | rev | cut -d'-' -f 2- | tr '[:upper:]' '[:lower:]'; done
+
+$(VERBOSE).SILENT: display_images
+
+#
+# build implicit rule
+#
+$(DIRECTORIES): %: ../%/Dockerfile
+	$(eval DIR := $(basename $@))
+	$(eval TAG := $(shell echo $(DIR) | rev | cut -d'/' -f 1 | rev | cut -d'-' -f 2- | tr '[:upper:]' '[:lower:]'))
+	$(eval IMAGEID := $(shell $(DOCKER) images -q $(ORG)/$(REPO):$(TAG)))
+	$(DOCKER) build -t $(ORG)/$(REPO):$(TAG) \
+		--build-arg IMAGE=$(ORG)/$(REPO):$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+	  --build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		../$@
+	if [ -n "$(IMAGEID)" ]; then $(DOCKER) rmi "$(IMAGEID)"; fi
+
+#
+# run implicit rule
+#
+.SECONDEXPANSION:
+$(addsuffix .run,$(DIRECTORIES)):
+	$(eval DIR := $(basename $@))
+	$(eval TAG := $(shell echo $(DIR) | rev | cut -d'/' -f 1 | rev | cut -d'-' -f 2- | tr '[:upper:]' '[:lower:]'))
+	$(DOCKER) run -v $$(pwd)/../..:/usr/src/SlicerExecutionModel -ti $(RM) $(ORG)/$(REPO):$(TAG) bash
+
+
+.PHONY: images display_images $(DIRECTORIES) $(addsuffix .run,$(DIRECTORIES))