fix for library script and changing java distribution to zulu-8

slavek · Sep 19, 2018 · 6d0411d · 6d0411d
1 parent 0ef8db7
commit 6d0411d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/grouper-midpoint/mp-gr/midpoint-server/Dockerfile b/grouper-midpoint/mp-gr/midpoint-server/Dockerfile
@@ -6,7 +6,10 @@ FROM tier/shibboleth_sp
 
 MAINTAINER info@evolveum.com
 
-RUN yum -y install java-1.8.0-openjdk
+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
 
 RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
 
@@ -59,4 +62,4 @@ ENV AJP_ENABLED true
 ENV AJP_PORT 9090
 ENV LOGOUT_URL https://localhost:4438/Shibboleth.sso/Logout
 
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/library.sh b/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/library.sh
@@ -5,19 +5,19 @@ linkSecrets(){
     	local label_file=`basename $filepath`
     	local file=$(echo $label_file| cut -d'_' -f 2)
 
-    	if [[ $label_file == shib_* ]]; then
+    	if [ $label_file = shib_* ]; then
             ln -sf /run/secrets/$label_file /etc/shibboleth/$file
-    	elif [ "$label_file" == "host-key.pem" ]; then
+    	elif [ "$label_file" = "host-key.pem" ]; then
             ln -sf /run/secrets/host-key.pem /etc/pki/tls/private/host-key.pem
     	fi
      done
 }
 
 
 checkMidpointSecurityProfile(){
-     if [[ $ACTIVE_PROFILE = *'sso'* ]]; then
+     if [ $ACTIVE_PROFILE = *'sso'* ]; then
 	cp /etc/httpd/possible-conf/midpoint-www-with-shibboleth-sso.conf /etc/httpd/conf.d/midpoint-www.conf
      else
         cp /etc/httpd/possible-conf/midpoint-www-without-shibboleth-sso.conf /etc/httpd/conf.d/midpoint-www.conf
      fi
-}
+}