[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1938-ge0957d3

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Jun 14 11:22:43 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  e0957d3211fae4484b53b5328c37ac7a34dacde5 (commit)
      from  96efb0a7cf9578619685851b9e40fbb1e227aa08 (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=e0957d3211fae4484b53b5328c37ac7a34dacde5

commit e0957d3211fae4484b53b5328c37ac7a34dacde5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jun 14 09:22:36 2017 +0000

    clean-up. thx to linuxfr users feedback

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6ca7269..53286e3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,17 @@
 FROM centos:centos7
-MAINTAINER FusionForge TrivialDev <franck.villaume at trivialdev.com>
+LABEL maintainer "franck.villaume at trivialdev.com"
+LABEL version "master"
+LABEL name "FusionForge"
+LABEL vendor "TrivialDev"
+LABEL description "all-in-one"
+LABEL license "GPLv2"
 
-RUN yum -y update; yum clean all
-RUN yum -y install git openssh-server; yum clean all
-RUN mkdir -p /opt/sources/ && cd /opt/sources && git clone https://scm.fusionforge.org/anonscm/git/fusionforge/fusionforge.git
-RUN cd /opt/sources/fusionforge && source ./autoinstall/common-backports && \
+RUN yum -y install git openssh-server && \
+    yum -y clean all;
+WORKDIR /opt/sources
+RUN git clone https://scm.fusionforge.org/anonscm/git/fusionforge/fusionforge.git
+WORKDIR /opt/sources/fusionforge
+RUN source ./autoinstall/common-backports && \
     yum install -y make tar && \
     backports_rpm && \
     yum --enablerepo=epel install -y httpd-itk && \
@@ -14,6 +21,7 @@ RUN cd /opt/sources/fusionforge && source ./autoinstall/common-backports && \
          moin mod_wsgi python-psycopg2 \
          unoconv poppler-utils libreoffice-headless \
          cronie mediawiki && \
+    yum -y clean all && \
     cd src/ && \
     make && \
     make install-base install-shell install-scm \
@@ -22,7 +30,8 @@ RUN cd /opt/sources/fusionforge && source ./autoinstall/common-backports && \
          install-plugin-taskboard install-plugin-message \
          install-plugin-repositoryapi install-plugin-mediawiki
 
-RUN yum --enablerepo=epel install -y supervisor
+RUN yum --enablerepo=epel install -y supervisor && \
+    yum -y clean all;
 
 RUN mkdir /var/run/sshd
 RUN /usr/sbin/sshd-keygen
@@ -31,11 +40,12 @@ USER postgres
 RUN /usr/bin/initdb -D /var/lib/pgsql/data
 
 USER root
-ADD ./supervisord.conf /etc/supervisord.conf
-ADD ./startpoint.sh /startpoint.sh
-ADD ./postinstall.sh /postinstall.sh
+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
 
 EXPOSE 22 80 443
 ENTRYPOINT ["/startpoint.sh"]
+CMD []

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

Summary of changes:
 docker/Dockerfile | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list