[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1990-gb89862b

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Jul 12 17:01:57 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  b89862b45a94532b080b110972ea0629b51addd0 (commit)
       via  b2d51f1f89a62cd5a6b24867d130fbc624f282d1 (commit)
      from  8c517bf745346223e6551246909e9f461bcb050b (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=b89862b45a94532b080b110972ea0629b51addd0

commit b89862b45a94532b080b110972ea0629b51addd0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jul 12 17:01:38 2017 +0200

    start support ftp in docker image

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d62ca60..c6ab04c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,13 +41,15 @@ RUN source ./autoinstall/common-backports && \
                    poppler-utils \
                    libreoffice-headless \
                    cronie \
-                   mediawiki && \
+                   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 \

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b2d51f1f89a62cd5a6b24867d130fbc624f282d1

commit b2d51f1f89a62cd5a6b24867d130fbc624f282d1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jul 12 17:01:17 2017 +0200

    add cronjobs in install-ftp

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 4dc42b1..f4c34ae 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -144,6 +144,7 @@ install-lists: install-base-dirs
 	$(CP_R) post-install.d/lists $(DESTDIR)$(pkgdatadir)/post-install.d/
 	$(INSTALL) -d -m 00755 $(DESTDIR)$(pkgdatadir)/lists/
 install-ftp: install-base-dirs
+    $(CP_R) cronjobs/ftp $(DESTDIR)$(pkgdatadir)/cronjobs/
 	$(CP_R) post-install.d/ftp $(DESTDIR)$(pkgdatadir)/post-install.d/
 
 install-base: install-base-dirs install-common install-web install-db install-scm

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

Summary of changes:
 docker/Dockerfile | 4 +++-
 src/GNUmakefile   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list