From 6d0411d40f0413452808026252023c371f2abe23 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 19 Sep 2018 12:39:52 +0000 Subject: [PATCH 1/2] fix for library script and changing java distribution to zulu-8 --- grouper-midpoint/mp-gr/midpoint-server/Dockerfile | 7 +++++-- .../container_files/usr-local-bin/library.sh | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/grouper-midpoint/mp-gr/midpoint-server/Dockerfile b/grouper-midpoint/mp-gr/midpoint-server/Dockerfile index da25d87..98d01c1 100644 --- 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"] \ No newline at end of file +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 index 7fd1c59..f574a66 100755 --- 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,9 +5,9 @@ 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 @@ -15,9 +15,9 @@ linkSecrets(){ 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 -} \ No newline at end of file +} From a4e87838f572391bbe0153b710fff83ae6422e3d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 19 Sep 2018 21:00:38 +0000 Subject: [PATCH 2/2] using of supervisor for starting services --- .../mp-gr/midpoint-server/Dockerfile | 5 ++- .../supervisord.conf} | 32 ++++++++++++------- .../container_files/usr-local-bin/init.sh | 7 ++++ 3 files changed, 31 insertions(+), 13 deletions(-) rename grouper-midpoint/mp-gr/midpoint-server/container_files/{usr-local-bin/entrypoint.sh => supervisor/supervisord.conf} (58%) mode change 100755 => 100644 create mode 100755 grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/init.sh diff --git a/grouper-midpoint/mp-gr/midpoint-server/Dockerfile b/grouper-midpoint/mp-gr/midpoint-server/Dockerfile index 98d01c1..21f0451 100644 --- a/grouper-midpoint/mp-gr/midpoint-server/Dockerfile +++ b/grouper-midpoint/mp-gr/midpoint-server/Dockerfile @@ -11,6 +11,9 @@ RUN curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.re RUN yum -y update RUN yum -y install zulu-8 +RUN yum -y install supervisor +COPY container_files/supervisor/supervisord.conf /etc/supervisord.conf + RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem COPY container_files/httpd/conf/* /etc/httpd/conf.d/ @@ -62,4 +65,4 @@ ENV AJP_ENABLED true ENV AJP_PORT 9090 ENV LOGOUT_URL https://localhost:4438/Shibboleth.sso/Logout -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] +CMD ["/usr/bin/supervisord"] diff --git a/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/entrypoint.sh b/grouper-midpoint/mp-gr/midpoint-server/container_files/supervisor/supervisord.conf old mode 100755 new mode 100644 similarity index 58% rename from grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/entrypoint.sh rename to grouper-midpoint/mp-gr/midpoint-server/container_files/supervisor/supervisord.conf index 28c4bb8..64a201e --- a/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/entrypoint.sh +++ b/grouper-midpoint/mp-gr/midpoint-server/container_files/supervisor/supervisord.conf @@ -1,15 +1,19 @@ -#!/bin/bash +[supervisord] +nodaemon=true -. /usr/local/bin/library.sh -linkSecrets +[program:init] +command=/usr/local/bin/init.sh +autostart=true -. /usr/local/bin/library.sh -checkMidpointSecurityProfile +[program:httpd-shib] +command=httpd-shib-foreground +stdout_logfile=/dev/fd/1 +stdout_logfile_maxbytes=0 +redirect_stderr=true +autostart=true - -httpd-shib-foreground & - -java -Xmx2048M -Xms2048M -Dfile.encoding=UTF8 \ +[program:midpoint] +command=/bin/bash -c "java -Xmx2048M -Xms2048M -Dfile.encoding=UTF8 \ -Dmidpoint.home=$MP_DIR/var \ -Dmidpoint.repository.database=mariadb \ -Dmidpoint.repository.jdbcUsername=$REPO_USER \ @@ -18,10 +22,14 @@ java -Xmx2048M -Xms2048M -Dfile.encoding=UTF8 \ -Dmidpoint.repository.hibernateHbm2ddl=none \ -Dmidpoint.repository.missingSchemaAction=create \ -Dmidpoint.repository.initializationFailTimeout=60000 \ - -Dmidpoint.logging.console.enabled=true -Dmidpoint.logging.console.prefix="midpoint;midpoint.log;$ENV;$USERTOKEN;" -Dmidpoint.logging.console.timezone=UTC \ + -Dmidpoint.logging.console.enabled=true -Dmidpoint.logging.console.prefix='midpoint;midpoint.log;$ENV;$USERTOKEN;' -Dmidpoint.logging.console.timezone=UTC \ -Dspring.profiles.active=$ACTIVE_PROFILE \ -Dauth.sso.header=$SSO_HEADER \ - -Dauth.logout.url="$LOGOUT_URL" \ + -Dauth.logout.url=$LOGOUT_URL \ -Dserver.tomcat.ajp.enabled=$AJP_ENABLED \ -Dserver.tomcat.ajp.port=$AJP_PORT \ - -jar $MP_DIR/lib/midpoint.war + -jar $MP_DIR/lib/midpoint.war" +stdout_logfile=/dev/fd/2 +stdout_logfile_maxbytes=0 +redirect_stderr=true +autostart=true diff --git a/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/init.sh b/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/init.sh new file mode 100755 index 0000000..fb23f5d --- /dev/null +++ b/grouper-midpoint/mp-gr/midpoint-server/container_files/usr-local-bin/init.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +. /usr/local/bin/library.sh +linkSecrets + +. /usr/local/bin/library.sh +checkMidpointSecurityProfile