Skip to content
Jump to bottom

Issue11 #14

Merged
11 commits merged into from
Nov 22, 2016
Merged

Issue11 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
900e10e
Added gsh script
Nov 21, 2016
df372ab
added path and order
Nov 21, 2016
21c9044
added other changes in variable
Nov 21, 2016
99f8701
added change of variable
Nov 21, 2016
f000fa9
removed value variable
Nov 21, 2016
b14bb9a
added variable with space
Nov 21, 2016
fe519a0
Added blank lines
Nov 21, 2016
a717c7f
Removed typo
Nov 21, 2016
c2984b2
fixed typo
Nov 22, 2016
12d8b77
added new scripts
Nov 22, 2016
798d17a
added run.sh to Dockerfile
Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions container_files/bin/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ 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|^|\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
4 changes: 4 additions & 0 deletions container_files/bin/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
while true; do
sleep 1800
done
8 changes: 6 additions & 2 deletions container_files/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,6 +56,8 @@ 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
/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
fi