Do a minor cleanup

1. demo/plain -> demo/simple
2. updated README.MD

Jenkinsfile

@@ -50,6 +50,7 @@ pipeline {
                 script {
                     try {
                         sh 'bin/test.sh &> debug'
+                        sh 'echo Test output ; cat debug'
                     } catch (error) {
                         def error_details = readFile('./debug')
                         def message = "BUILD ERROR: There was a problem testing ${imagename}:${tag}. \n\n ${error_details}"

README.md

@@ -9,14 +9,18 @@ The image contains the midPoint application along with some TIER-specific compon
 - midPoint version-specific tags, e.g. 3.9, 3.9.1, 4.0, etc.
 
 # Content
-- `midpoint` directory contains build instructions for the `midpoint` image along with `docker-compose.yml` showing its basic use,
-- `demo` directory contains three demonstration scenarios:
+- the root directory contains build instructions for the `midpoint` image 
+- `demo` directory contains a couple of demonstration scenarios:
+  - `simple` to show simple composition of midPoint with the repository,
   - `shibboleth` to show integration with Shibboleth IdP,
   - `postgresql` to show how to change the repository implementation,
   - `complex` to demonstrate more complex deployment of midPoint in a sample university environment, featuring midPoint along with Grouper, LDAP directory, RabbitMQ, Shibboleth IdP, source and target systems.
 
 # Build instructions
-Please see specific subdirectories: [midpoint](midpoint) and [demo/complex](demo/complex).
+```
+$ ./build.sh
+```
+You can then continue with one of demo composition, e.g. simple or complex one.
 
 # Documentation
 - For the `midpoint` image and container themselves please see [Dockerized midPoint](https://spaces.at.internet2.edu/display/MID/Dockerized+midPoint) wiki page.

build.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+function normalize_path()
+{
+    # Remove all /./ sequences.
+    local path=${1//\/.\//\/}
+
+    # Remove dir/.. sequences.
+    while [[ $path =~ ([^/][^/]*/\.\./) ]]
+    do
+        path=${path/${BASH_REMATCH[0]}/}
+    done
+    echo $path
+}
+
+cd "$(dirname "$0")"
+./download-midpoint
+docker build --tag tier/midpoint:latest midpoint-server
+echo "---------------------------------------------------------------------------------------"
+echo "The midPoint containers were successfully built. To start them, execute the following:"
+echo ""
+echo "(for simple demo)"
+echo ""
+echo "$ cd" $(normalize_path `pwd`/../demo/simple)
+echo "$ docker-compose up --build"
+echo ""
+echo "(for complex demo)"
+echo ""
+echo "$ cd" $(normalize_path `pwd`/../demo/complex)
+echo "$ docker-compose up --build"