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 075d22e3a257cbe5ce1e4b7f90c2627b6f8c4d5e (commit)
via ca5ba34be815a0f5051ffacef8dca2413bd2b6af (commit)
from cdae51e31a72db475069e2b65c726b72e18ae9a4 (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=075d22e3a257cbe5ce1e4b7f90c2627b6f8c4d5e
commit 075d22e3a257cbe5ce1e4b7f90c2627b6f8c4d5e
Author: Franck Villaume <[email protected]>
Date: Fri Jun 2 14:12:36 2017 +0000
docker: fix scm host resolution
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 7f16e84..61ab381 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -26,10 +26,15 @@ __postinstall() {
/usr/local/share/fusionforge/post-install.d/shell/shell.sh rawconfigure
}
+__etchost() {
+echo "127.0.0.1 scm."`hostname -f` >> /etc/hosts
+}
+
__run_supervisor() {
supervisord -n
}
# Call all functions
__postinstall
+__etchost
__run_supervisor
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ca5ba34be815a0f5051ffacef8dca2413bd2b6af
commit ca5ba34be815a0f5051ffacef8dca2413bd2b6af
Author: Franck Villaume <[email protected]>
Date: Fri Jun 2 13:46:29 2017 +0000
docker: shell support
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 4177dbd..7f16e84 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -23,6 +23,7 @@ set -e
__postinstall() {
/usr/local/share/fusionforge/post-install.d/common/common.sh configure
/usr/local/share/fusionforge/post-install.d/web/web.sh rawconfigure
+/usr/local/share/fusionforge/post-install.d/shell/shell.sh rawconfigure
}
__run_supervisor() {
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index 32ef9ef..1acf470 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -78,3 +78,7 @@ priority=900
[program:crond]
command=/usr/sbin/crond -n
autorestart=true
+
+[program:nscd]
+command=/usr/sbin/nscd -d
+autorestart=true
-----------------------------------------------------------------------
Summary of changes:
docker/startpoint.sh | 6 ++++++
docker/supervisord.conf | 4 ++++
2 files changed, 10 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
