Do a minor cleanup

1. demo/plain -> demo/simple 2. updated README.MD
docker · Sep 27, 2018 · 882c8c9beed5c1dd805178d69b96eb222f1c85bb · 882c8c9
1 parent ee9c5ac
commit 882c8c9beed5c1dd805178d69b96eb222f1c85bb
diff --git a/Jenkinsfile b/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}"

diff --git a/README.md b/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.

diff --git a/build.sh b/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"
diff --git a/cleanup.sh b/cleanup.sh
diff --git a/demo/plain/.env → demo/simple/.env b/demo/plain/.env → demo/simple/.env
diff --git a/...idpoint/application/database_password.txt → ...idpoint/application/database_password.txt b/...idpoint/application/database_password.txt → ...idpoint/application/database_password.txt
diff --git a/...idpoint/application/keystore_password.txt → ...idpoint/application/keystore_password.txt b/...idpoint/application/keystore_password.txt → ...idpoint/application/keystore_password.txt
diff --git a/...-and-secrets/midpoint/httpd/host-cert.pem → ...-and-secrets/midpoint/httpd/host-cert.pem b/...-and-secrets/midpoint/httpd/host-cert.pem → ...-and-secrets/midpoint/httpd/host-cert.pem
diff --git a/...s-and-secrets/midpoint/httpd/host-key.pem → ...s-and-secrets/midpoint/httpd/host-key.pem b/...s-and-secrets/midpoint/httpd/host-key.pem → ...s-and-secrets/midpoint/httpd/host-key.pem
diff --git a/...rets/midpoint/shibboleth/idp-metadata.xml → ...rets/midpoint/shibboleth/idp-metadata.xml b/...rets/midpoint/shibboleth/idp-metadata.xml → ...rets/midpoint/shibboleth/idp-metadata.xml
diff --git a/...crets/midpoint/shibboleth/shibboleth2.xml → ...crets/midpoint/shibboleth/shibboleth2.xml b/...crets/midpoint/shibboleth/shibboleth2.xml → ...crets/midpoint/shibboleth/shibboleth2.xml
diff --git a/...d-secrets/midpoint/shibboleth/sp-cert.pem → ...d-secrets/midpoint/shibboleth/sp-cert.pem b/...d-secrets/midpoint/shibboleth/sp-cert.pem → ...d-secrets/midpoint/shibboleth/sp-cert.pem
diff --git a/...nd-secrets/midpoint/shibboleth/sp-key.pem → ...nd-secrets/midpoint/shibboleth/sp-key.pem b/...nd-secrets/midpoint/shibboleth/sp-key.pem → ...nd-secrets/midpoint/shibboleth/sp-key.pem
diff --git a/demo/plain/docker-compose.yml → demo/simple/docker-compose.yml b/demo/plain/docker-compose.yml → demo/simple/docker-compose.yml
diff --git a/test.sh → midpoint-obsolete/test-root.sh b/test.sh → midpoint-obsolete/test-root.sh
diff --git a/test/common.sh → midpoint-obsolete/test/common.sh b/test/common.sh → midpoint-obsolete/test/common.sh