Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/docker-ci.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2020-01-29 17:19:00 +0300
committerArthur Schiwon <blizzz@arthur-schiwon.de>2020-01-29 18:32:35 +0300
commit590184737b68f8322b3f5b71542c276fa1a0be39 (patch)
tree2f7b16b5894e1a59476519d78b96dbe02801fef3
parentb5dfb0dee687c71b0d0d5962406c92a1058334ee (diff)
let's try nc over a dumb waiting timeuser_saml_shibboleth_php7.2-3
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
-rwxr-xr-xuser_saml_shibboleth-php7.2/Dockerfile1
-rw-r--r--user_saml_shibboleth-php7.2/start.sh14
2 files changed, 14 insertions, 1 deletions
diff --git a/user_saml_shibboleth-php7.2/Dockerfile b/user_saml_shibboleth-php7.2/Dockerfile
index e8e5dce..71e171b 100755
--- a/user_saml_shibboleth-php7.2/Dockerfile
+++ b/user_saml_shibboleth-php7.2/Dockerfile
@@ -27,6 +27,7 @@ RUN chmod -R 777 /opt/
RUN rm -f /etc/httpd/conf.d/nss.conf
ADD apache/httpd.conf /etc/httpd/conf/httpd.conf
+RUN yum -y install nc
# Add the startup file
ADD start.sh /start.sh
diff --git a/user_saml_shibboleth-php7.2/start.sh b/user_saml_shibboleth-php7.2/start.sh
index 5dae461..abc48b5 100644
--- a/user_saml_shibboleth-php7.2/start.sh
+++ b/user_saml_shibboleth-php7.2/start.sh
@@ -17,4 +17,16 @@ sed -i "s/^-Xmx.*$/-Xmx$JETTY_MAX_HEAP/g" /opt/shib-jetty-base/start.ini
apachectl &
/usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir &
-sleep 15 && /etc/init.d/jetty run &
+
+# wait for LDAP
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
+do
+ nc -zw 5 localhost 389
+ IS_LDAP=$?
+ if [ ${IS_LDAP} -eq 0 ]; then
+ break
+ fi
+ sleep 1
+done
+
+/etc/init.d/jetty run &