[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1945-g9fa15ef

Franck Villaume nerville at libremir.placard.fr.eu.org
Tue Jun 20 10:17:24 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  9fa15efd7ba1cee6ea88042899b0e9d75838668f (commit)
      from  029d46459634dc7159508f0dab9136736d66e475 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9fa15efd7ba1cee6ea88042899b0e9d75838668f

commit 9fa15efd7ba1cee6ea88042899b0e9d75838668f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Jun 20 08:17:17 2017 +0000

    docker: fix database init in swarm mode

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 445d148..d62ca60 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -63,7 +63,8 @@ RUN source ./autoinstall/common-backports && \
          install-plugin-scmhook \
          install-plugin-webanalytics 
 
-RUN yum --enablerepo=epel install -y supervisor && \
+RUN yum --enablerepo=epel install -y supervisor \
+                                     net-tools && \
     yum -y clean all;
 
 RUN mkdir /var/run/sshd
diff --git a/docker/postinstall.sh b/docker/postinstall.sh
index 3489bf9..203a79b 100644
--- a/docker/postinstall.sh
+++ b/docker/postinstall.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+while [ -z "`netstat -tln | grep 5432`" ]; do
+  echo 'Waiting for PostgreSQL to start ...'
+  sleep 1
+done
+echo 'PostgreSQL started.'
 /usr/local/share/fusionforge/post-install.d/db/db.sh configure
 cd /opt/sources/fusionforge/src
 for pluginname in blocks compactpreview gravatar headermenu mediawiki message moinmoin repositoryapi scmgit scmhook scmsvn taskboard webanalytics; do

-----------------------------------------------------------------------

Summary of changes:
 docker/Dockerfile     | 3 ++-
 docker/postinstall.sh | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list