[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1908-g09859ea

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Jun 5 16:43:43 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  09859eaaa2ade2a65f6c5e960d8076c474ce10ae (commit)
      from  e15d30a92fb963e6e991f5c47eceb532e071a913 (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=09859eaaa2ade2a65f6c5e960d8076c474ce10ae

commit 09859eaaa2ade2a65f6c5e960d8076c474ce10ae
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Jun 5 14:43:36 2017 +0000

    docker: support more default plugins

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6a2c9a0..ac1a11a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -33,7 +33,9 @@ RUN /usr/bin/initdb -D /var/lib/pgsql/data
 USER root
 ADD ./supervisord.conf /etc/supervisord.conf
 ADD ./startpoint.sh /startpoint.sh
+ADD ./postinstall.sh /postinstall.sh
 RUN chmod +x /startpoint.sh
+RUN chmod +x /postinstall.sh
 
 EXPOSE 22 80 443
 ENTRYPOINT ["/startpoint.sh"]
diff --git a/docker/postinstall.sh b/docker/postinstall.sh
new file mode 100644
index 0000000..5e11a78
--- /dev/null
+++ b/docker/postinstall.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+/usr/local/share/fusionforge/post-install.d/db/db.sh configure
+cd /opt/sources/fusionforge/src
+for pluginname in blocks message scmgit scmsvn taskboard; do
+    make post-install-plugin-${pluginname}
+done
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index 1acf470..a84cb5f 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -57,8 +57,8 @@ stderr_logfile=/var/log/supervisor/%(program_name)s.log
 autorestart=true
 priority=100
 
-[program:initdb]
-command=/usr/local/share/fusionforge/post-install.d/db/db.sh configure
+[program:postinstall]
+command=/postinstall.sh
 user=root
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
@@ -73,7 +73,7 @@ autorestart=true
 [program:httpd]
 command=/usr/sbin/httpd -DFOREGROUND
 autorestart=true
-priority=900
+priority=800
 
 [program:crond]
 command=/usr/sbin/crond -n

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

Summary of changes:
 docker/Dockerfile       | 2 ++
 docker/postinstall.sh   | 6 ++++++
 docker/supervisord.conf | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 docker/postinstall.sh


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list