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, 6.1 has been updated
via 4bf1b8196b2c28b9af9ad94f2e24753a41cd0820 (commit)
from 6fc8b3bd2db118495d7c7f9ab53e0193d47e7046 (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=4bf1b8196b2c28b9af9ad94f2e24753a41cd0820
commit 4bf1b8196b2c28b9af9ad94f2e24753a41cd0820
Author: Franck Villaume <[email protected]>
Date: Mon May 21 15:04:54 2018 +0000
fix scmhg in docker image, add missing killal command
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 16deb74..e373c06 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,6 +6,7 @@ LABEL vendor "TrivialDev"
LABEL description "all-in-one"
LABEL license "GPLv2"
+RUN sed -i '/nodocs/d' /etc/yum.conf
RUN yum -y install git openssh-server && \
yum -y clean all;
WORKDIR /opt/sources
@@ -47,7 +48,8 @@ RUN source ./autoinstall/common-backports && \
mediawiki \
vsftpd \
mercurial \
- dejavu-fonts-common && \
+ dejavu-fonts-common \
+ psmisc && \
yum -y clean all
RUN yum --enablerepo=epel install -y supervisor \
-----------------------------------------------------------------------
Summary of changes:
docker/Dockerfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
