Update master branch, part 1

- Updated master branch with changes from the laboratory - Temporarily removed obsolete demo/complex - Fixed download script to reflect new URL of midPoint distribution server - Upgraded midPoint to 4.0.1
docker · Nov 5, 2019 · d05e36908ad3897f47e72116791d1b5e31348b43 · d05e369
1 parent 07f29a3
commit d05e36908ad3897f47e72116791d1b5e31348b43
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+midpoint-dist.tar.gz
+tmp
+demo/complex/tmp
+demo/complex2/tmp
+
diff --git a/Dockerfile b/Dockerfile
@@ -2,15 +2,15 @@
 #  Building assumes midpoint-dist.tar.gz is present in the current directory.
 #
 
-FROM tier/shibboleth_sp
+FROM tier/shibboleth_sp:3.0.4_03122019
 
 MAINTAINER info@evolveum.com
 
 RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems
 RUN curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo
 RUN yum -y update
 RUN yum -y install \
- 	zulu-8 \
+ 	zulu-11 \
         cron \
         supervisor \
 	libcurl \
@@ -47,7 +47,7 @@ RUN cp /dev/null /etc/httpd/conf.d/ssl.conf \
 
 # Build arguments
 
-ARG MP_VERSION=4.0
+ARG MP_VERSION=4.0.1
 ARG MP_DIST_FILE=midpoint-dist.tar.gz
 
 ENV MP_DIR /opt/midpoint
@@ -60,7 +60,9 @@ COPY container_files/mp-dir/ ${MP_DIR}/
 RUN echo 'Extracting midPoint archive...' \
  && tar xzf ${MP_DIR}/${MP_DIST_FILE} -C ${MP_DIR} --strip-components=1
 
-VOLUME ${MP_DIR}/var
+# Disabled because of wider compatibility issues (e.g. AWS)
+# TODO: consider all the consequences
+#VOLUME ${MP_DIR}/var
 
 # Repository parameters
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -61,7 +61,7 @@ pipeline {
                         sh '(cd demo/simple ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                         sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                         sh '(cd demo/postgresql ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
-                        sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
+                        //sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                     } 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/container_files/usr-local-bin/start-httpd.sh b/container_files/usr-local-bin/start-httpd.sh
@@ -21,7 +21,8 @@ case $AUTHENTICATION in
     echo "*** Starting httpd WITH Shibboleth support"
     set -e
     rm -f /etc/httpd/logs/httpd.pid
-    (/usr/sbin/shibd) & httpd -DFOREGROUND
+    export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
+    (/usr/sbin/shibd -f) & httpd -DFOREGROUND
     ;;
   internal)
     echo "*** Starting httpd WITHOUT Shibboleth support"

diff --git a/demo/complex/.env b/demo/complex/.env
diff --git a/demo/complex/README.md b/demo/complex/README.md
diff --git a/demo/complex/add-ref-groups.gsh b/demo/complex/add-ref-groups.gsh
diff --git a/demo/complex/add-ref-groups.sh b/demo/complex/add-ref-groups.sh
diff --git a/demo/complex/after-installation.sh b/demo/complex/after-installation.sh
diff --git a/demo/complex/configs-and-secrets/grouper/application/database_password.txt b/demo/complex/configs-and-secrets/grouper/application/database_password.txt
diff --git a/demo/complex/configs-and-secrets/grouper/application/grouper-loader.properties b/demo/complex/configs-and-secrets/grouper/application/grouper-loader.properties
diff --git a/demo/complex/configs-and-secrets/grouper/application/grouper.client.properties b/demo/complex/configs-and-secrets/grouper/application/grouper.client.properties
diff --git a/demo/complex/configs-and-secrets/grouper/application/grouper.hibernate.properties b/demo/complex/configs-and-secrets/grouper/application/grouper.hibernate.properties
diff --git a/demo/complex/configs-and-secrets/grouper/application/grouper.properties b/demo/complex/configs-and-secrets/grouper/application/grouper.properties
diff --git a/demo/complex/configs-and-secrets/grouper/application/rabbitmq_password.txt b/demo/complex/configs-and-secrets/grouper/application/rabbitmq_password.txt