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 1d34cfad03c1fb1601cce049c89f94509d56d032 (commit)
via def6cb2b43db674ebb95bf239954a32c32f4e046 (commit)
from b89862b45a94532b080b110972ea0629b51addd0 (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=1d34cfad03c1fb1601cce049c89f94509d56d032
commit 1d34cfad03c1fb1601cce049c89f94509d56d032
Author: Franck Villaume <[email protected]>
Date: Wed Jul 12 17:25:33 2017 +0200
add vsftpd support in docker image
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c6ab04c..b7f99e8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -82,6 +82,6 @@ COPY ./postinstall.sh /postinstall.sh
RUN chmod +x /startpoint.sh
RUN chmod +x /postinstall.sh
-EXPOSE 22 80 443
+EXPOSE 21 22 80 443
ENTRYPOINT ["/startpoint.sh"]
CMD []
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 745eed8..0fa8bd4 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -24,6 +24,7 @@ __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
+/usr/local/share/fusionforge/post-install.d/ftp/ftp.sh configure
}
__zzzzlocalini() {
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index a84cb5f..6036bfa 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -82,3 +82,7 @@ autorestart=true
[program:nscd]
command=/usr/sbin/nscd -d
autorestart=true
+
+[program:vsftpd]
+command=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf
+autorestart=true
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=def6cb2b43db674ebb95bf239954a32c32f4e046
commit def6cb2b43db674ebb95bf239954a32c32f4e046
Author: Franck Villaume <[email protected]>
Date: Wed Jul 12 17:25:04 2017 +0200
support docker to restart vsftpd
diff --git a/src/post-install.d/ftp/ftp.sh b/src/post-install.d/ftp/ftp.sh
index fa6ab48..92f59a3 100755
--- a/src/post-install.d/ftp/ftp.sh
+++ b/src/post-install.d/ftp/ftp.sh
@@ -18,7 +18,6 @@
# with FusionForge; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-set -x
set -e
. $(forge_get_config source_path)/post-install.d/common/service.inc
@@ -37,7 +36,11 @@ remove_ftpd() {
restart_ftp_service()
{
- service vsftpd restart
+ if [[ $is_docker ]]; then
+ killall vsftpd >/dev/null 2>&1
+ else
+ service vsftpd restart
+ fi
}
# Main
-----------------------------------------------------------------------
Summary of changes:
docker/Dockerfile | 2 +-
docker/startpoint.sh | 1 +
docker/supervisord.conf | 4 ++++
src/post-install.d/ftp/ftp.sh | 7 +++++--
4 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
