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 66519e3324d1c706c28f55cc0b25cd8d7875f5da (commit)
from 5a0a1bfdce3ed67b73c0aa08da83077d0e4b3d93 (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=66519e3324d1c706c28f55cc0b25cd8d7875f5da
commit 66519e3324d1c706c28f55cc0b25cd8d7875f5da
Author: Franck Villaume <[email protected]>
Date: Tue Jul 25 13:41:55 2017 +0000
docker: support VOLUME
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b7f99e8..42cf5c1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,45 +43,22 @@ RUN source ./autoinstall/common-backports && \
cronie \
mediawiki \
vsftpd && \
- yum -y clean all && \
- cd src/ && \
- make && \
- make install-base \
- install-shell \
- install-scm \
- install-ftp \
- install-plugin-scmcvs \
- install-plugin-scmsvn \
- install-plugin-scmgit \
- install-plugin-blocks \
- install-plugin-moinmoin \
- install-plugin-taskboard \
- install-plugin-message \
- install-plugin-repositoryapi \
- install-plugin-mediawiki \
- install-plugin-compactpreview \
- install-plugin-headermenu \
- install-plugin-gravatar \
- install-plugin-scmhook \
- install-plugin-webanalytics
+ yum -y clean all
RUN yum --enablerepo=epel install -y supervisor \
net-tools && \
- yum -y clean all;
+ yum -y clean all
RUN mkdir /var/run/sshd
RUN /usr/sbin/sshd-keygen
-USER postgres
-RUN /usr/bin/initdb -D /var/lib/pgsql/data
-
-USER root
COPY ./supervisord.conf /etc/supervisord.conf
COPY ./startpoint.sh /startpoint.sh
COPY ./postinstall.sh /postinstall.sh
RUN chmod +x /startpoint.sh
RUN chmod +x /postinstall.sh
+VOLUME ["/var/lib/pgsql", "/etc/fusionforge", "/var/lib/fusionforge"]
EXPOSE 21 22 80 443
ENTRYPOINT ["/startpoint.sh"]
CMD []
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index d9f612d..566d1ca 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -19,6 +19,41 @@
# with FusionForge; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+__initdb() {
+if [[ ! -d /var/lib/pgsql/backups ]]; then
+ mkdir -p /var/lib/pgsql/backups
+ chown postgres:postgres /var/lib/pgsql/backups
+fi
+if [[ ! -d /var/lib/pgsql/data ]]; then
+ mkdir -p /var/lib/pgsql/data
+ chown postgres:postgres /var/lib/pgsql/data
+ 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 &"
+}
+
+__install() {
+cd /opt/sources/fusionforge/src/ && \
+make && \
+make install-base \
+ install-shell \
+ install-scm \
+ install-ftp \
+ install-plugin-scmcvs \
+ install-plugin-scmsvn \
+ install-plugin-scmgit \
+ install-plugin-blocks \
+ install-plugin-moinmoin \
+ install-plugin-taskboard \
+ install-plugin-message \
+ install-plugin-repositoryapi \
+ install-plugin-mediawiki \
+ install-plugin-compactpreview \
+ install-plugin-headermenu \
+ install-plugin-gravatar \
+ install-plugin-scmhook \
+ install-plugin-webanalytics
+}
__postinstall() {
/usr/local/share/fusionforge/post-install.d/common/common.sh configure
/usr/local/share/fusionforge/post-install.d/web/web.sh rawconfigure
@@ -49,6 +84,8 @@ supervisord -n
}
# Call all functions
+__initdb
+__install
__postinstall
__zzzzlocalini
__etchost
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index 6036bfa..182620f 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -49,14 +49,6 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL
for a unix socket
;prompt=mysupervisor ; cmd line prompt (default "supervisor")
;history_file=~/.sc_history ; use readline history if available
-[program:postgresql]
-command=/usr/bin/postgres -D /var/lib/pgsql/data -p 5432
-user=postgres
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-stderr_logfile=/var/log/supervisor/%(program_name)s.log
-autorestart=true
-priority=100
-
[program:postinstall]
command=/postinstall.sh
user=root
-----------------------------------------------------------------------
Summary of changes:
docker/Dockerfile | 29 +++--------------------------
docker/startpoint.sh | 37 +++++++++++++++++++++++++++++++++++++
docker/supervisord.conf | 8 --------
3 files changed, 40 insertions(+), 34 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
