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 0125d4cd49a890b139f06f196a1d2dbec1991eec (commit)
via f8d3cce838af0c6b20bf574ce97479826545858b (commit)
from 1a5796ffb6da5326f7379dddf66219fd7b0e2977 (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=0125d4cd49a890b139f06f196a1d2dbec1991eec
commit 0125d4cd49a890b139f06f196a1d2dbec1991eec
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Tue Aug 8 22:54:40 2017 +0200
fix database init in docker
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 113dbcf..23057b7 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -27,8 +27,11 @@ fi
if [[ ! -d /var/lib/pgsql/data ]]; then
mkdir -p /var/lib/pgsql/data
chown postgres:postgres /var/lib/pgsql/data
+fi
+if [[ ! -f /var/lib/pgsql/data/postgresql.conf ]]; then
su postgres -c "/usr/bin/initdb -D /var/lib/pgsql/data"
fi
+
su postgres -c "/usr/bin/postgres -D /var/lib/pgsql/data -p 5432 &"
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f8d3cce838af0c6b20bf574ce97479826545858b
commit f8d3cce838af0c6b20bf574ce97479826545858b
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Tue Aug 8 21:03:27 2017 +0200
docker: enable mercurial support
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 42cf5c1..b9543ae 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -42,7 +42,8 @@ RUN source ./autoinstall/common-backports && \
libreoffice-headless \
cronie \
mediawiki \
- vsftpd && \
+ vsftpd \
+ mercurial && \
yum -y clean all
RUN yum --enablerepo=epel install -y supervisor \
diff --git a/docker/postinstall.sh b/docker/postinstall.sh
index 203a79b..957566b 100644
--- a/docker/postinstall.sh
+++ b/docker/postinstall.sh
@@ -6,6 +6,6 @@ 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
+for pluginname in blocks compactpreview gravatar headermenu mediawiki message
moinmoin repositoryapi scmgit scmhook scmsvn scmhg taskboard webanalytics; do
make post-install-plugin-${pluginname}
done
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 566d1ca..113dbcf 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -42,6 +42,7 @@ make install-base \
install-plugin-scmcvs \
install-plugin-scmsvn \
install-plugin-scmgit \
+ install-plugin-scmhg \
install-plugin-blocks \
install-plugin-moinmoin \
install-plugin-taskboard \
-----------------------------------------------------------------------
Summary of changes:
docker/Dockerfile | 3 ++-
docker/postinstall.sh | 2 +-
docker/startpoint.sh | 4 ++++
3 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
