From 900e10e3d3a7e73095984ba946c89367698e4283 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 18:09:55 +0100 Subject: [PATCH 01/11] Added gsh script --- container_files/bin/start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index 48c58e44..c49fd0c9 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -54,6 +54,8 @@ else /opt/autoexec/bin/firstrun.sh date >> $log /usr/local/bin/httpd-shib-foreground & + cd /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/ + ./gsh -loader & /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run fi fi From df372ab26f497f5cfd0dbd1c23f03802bb64a8b6 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 20:54:28 +0100 Subject: [PATCH 02/11] added path and order --- container_files/bin/start.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index c49fd0c9..0d9bbca9 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -54,8 +54,7 @@ else /opt/autoexec/bin/firstrun.sh date >> $log /usr/local/bin/httpd-shib-foreground & - cd /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/ - ./gsh -loader & - /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run + /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run & + PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader fi fi From 21c9044b71784e250d66359f70a05dcd5550d68d Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 22:40:21 +0100 Subject: [PATCH 03/11] added other changes in variable --- container_files/bin/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index 0d9bbca9..c081d060 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -54,7 +54,7 @@ else /opt/autoexec/bin/firstrun.sh date >> $log /usr/local/bin/httpd-shib-foreground & - /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run & - PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader + /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run + GROUPER_HOME=/opt/grouper/$version/grouper.apiBinary-$version/bin; PWD=/opt/grouper/$version/grouper.apiBinary-$version/bin /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh -loader fi fi From 99f870131589d078e92c6acc1c291db9d182fee3 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 23:08:49 +0100 Subject: [PATCH 04/11] added change of variable --- container_files/bin/configure.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh index f092a113..b4398dff 100755 --- a/container_files/bin/configure.sh +++ b/container_files/bin/configure.sh @@ -25,3 +25,7 @@ sed -i "s|#MYSQL_DATABASE#|$MYSQL_DATABASE|g" /opt/etc/grouper.properties >> $lo cat /opt/etc/grouper.hibernate.properties >> $log cat /opt/etc/grouper.properties >> $log + +#Configure gsh loader +sed -i '1s/^/PWD=/opt/grouper/$version/grouper.apiBinary-$version/bin/' /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh >> $log +sed -i '1s/^/GROUPER_HOME=/opt/grouper/$version/grouper.apiBinary-$version/bin/' /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh >> $log From f000fa96fc1ab6ae24e478484c1b524a415eb4aa Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 23:10:09 +0100 Subject: [PATCH 05/11] removed value variable --- container_files/bin/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index c081d060..6101b26a 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -54,7 +54,7 @@ else /opt/autoexec/bin/firstrun.sh date >> $log /usr/local/bin/httpd-shib-foreground & - /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run - GROUPER_HOME=/opt/grouper/$version/grouper.apiBinary-$version/bin; PWD=/opt/grouper/$version/grouper.apiBinary-$version/bin /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh -loader + /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run & + /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh -loader fi fi From b14bb9a71f552b8f5a9f718f41b5f10f5a14ed24 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 23:12:19 +0100 Subject: [PATCH 06/11] added variable with space --- container_files/bin/configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh index b4398dff..1463b76c 100755 --- a/container_files/bin/configure.sh +++ b/container_files/bin/configure.sh @@ -27,5 +27,5 @@ cat /opt/etc/grouper.hibernate.properties >> $log cat /opt/etc/grouper.properties >> $log #Configure gsh loader -sed -i '1s/^/PWD=/opt/grouper/$version/grouper.apiBinary-$version/bin/' /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh >> $log -sed -i '1s/^/GROUPER_HOME=/opt/grouper/$version/grouper.apiBinary-$version/bin/' /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh >> $log +sed -i '1s/^/PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ ' /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log +sed -i '1s/^/GROUPER_HOME=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ ' /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log From fe519a050917ff6edec574399f7941571d6d46fc Mon Sep 17 00:00:00 2001 From: villadalmine Date: Mon, 21 Nov 2016 23:45:08 +0100 Subject: [PATCH 07/11] Added blank lines --- container_files/bin/configure.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh index 1463b76c..b8450a4d 100755 --- a/container_files/bin/configure.sh +++ b/container_files/bin/configure.sh @@ -27,5 +27,8 @@ cat /opt/etc/grouper.hibernate.properties >> $log cat /opt/etc/grouper.properties >> $log #Configure gsh loader -sed -i '1s/^/PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ ' /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log -sed -i '1s/^/GROUPER_HOME=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ ' /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log +sed -i "1s|^|\n |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log +sed -i "1s|^|PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log +sed -i "1s|^|\n |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log +sed -i "1s|^|GROUPER_HOME=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |' /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log +some text at the beginning From a717c7f017264128da3f0c3a1f8d1c8fd2e5ae2b Mon Sep 17 00:00:00 2001 From: villadalmine Date: Tue, 22 Nov 2016 00:36:01 +0100 Subject: [PATCH 08/11] Removed typo --- container_files/bin/configure.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh index b8450a4d..d49841be 100755 --- a/container_files/bin/configure.sh +++ b/container_files/bin/configure.sh @@ -30,5 +30,4 @@ cat /opt/etc/grouper.properties >> $log sed -i "1s|^|\n |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log sed -i "1s|^|PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log sed -i "1s|^|\n |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log -sed -i "1s|^|GROUPER_HOME=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |' /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log -some text at the beginning +sed -i "1s|^|GROUPER_HOME=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log From c2984b230ff82509642eb5060fbb28b5aec06413 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Tue, 22 Nov 2016 01:34:25 +0100 Subject: [PATCH 09/11] fixed typo --- container_files/bin/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index 6101b26a..e978d3ca 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -55,6 +55,6 @@ else date >> $log /usr/local/bin/httpd-shib-foreground & /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run & - /opt/grouper/$version/grouper.apiBinary-$version/bin/gsh -loader + /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader fi fi From 12d8b77727bd6b9f8c6cfe48ac9c3ff37a68a9ce Mon Sep 17 00:00:00 2001 From: villadalmine Date: Tue, 22 Nov 2016 01:45:27 +0100 Subject: [PATCH 10/11] added new scripts --- container_files/bin/run.sh | 4 ++++ container_files/bin/start.sh | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 container_files/bin/run.sh diff --git a/container_files/bin/run.sh b/container_files/bin/run.sh new file mode 100755 index 00000000..e686a456 --- /dev/null +++ b/container_files/bin/run.sh @@ -0,0 +1,4 @@ +#!/bin/bash +while true; do +sleep 1800 +done diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index e978d3ca..dae767e5 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -20,7 +20,9 @@ then echo "Starting tomcat and apache" /opt/autoexec/bin/firstrun.sh /usr/local/bin/httpd-shib-foreground & - /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run + /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run & + /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader & + /usr/local/bin/run.sh fi else echo "Composed so waiting for MariaDB: " > $log @@ -55,6 +57,7 @@ else date >> $log /usr/local/bin/httpd-shib-foreground & /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run & - /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader + /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader & + /usr/local/bin/run.sh fi fi From 798d17aa3aa12530f0c62711456c7be57f917de4 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Tue, 22 Nov 2016 01:47:25 +0100 Subject: [PATCH 11/11] added run.sh to Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b5688fe7..8654283f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,7 @@ RUN mkdir -p /opt/grouper/$VERSION \ cp /opt/etc/grouper.hibernate.pointer.properties /opt/grouper/$version/grouper.ws-$version/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \ rm /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \ cp /opt/etc/grouper.hibernate.pointer.properties /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \ + ln -sf /opt/bin/run.sh /usr/local/bin/run.sh && \ updatedb #/opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties