From 151b31b6f47fb3d96afdd66138ff40d92cac6202 Mon Sep 17 00:00:00 2001 From: startxfr Date: Sat, 28 Nov 2015 14:39:12 +0100 Subject: mise en place du service apache --- Services/apache/Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Services/apache/Dockerfile') diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile index d382ea7..8db1b4f 100644 --- a/Services/apache/Dockerfile +++ b/Services/apache/Dockerfile @@ -2,21 +2,21 @@ FROM startx/fedora MAINTAINER Christophe LARUE USER root -# Install packages and set up httpd -RUN dnf -y install httpd \ - && dnf clean all \ - && mkdir -p /var/www/html \ - && mkdir -p /var/log/httpd -# Copy startx toolkit -COPY sx/* /sx/ -COPY httpd.conf /etc/httpd/conf.d/sx.conf -# Copy html content -COPY html/* /var/www/html/ -RUN chmod ug+rx /sx/httpd* \ - && chmod ug+r /var/www/html/* \ - && chown -R apache:apache /var/www/html /var/log/httpd +RUN dnf -y install httpd && \ + dnf clean all +COPY httpd.conf /etc/httpd/conf.d/app.conf +COPY run.sh /bin/ +RUN chmod 775 /bin/run.sh && \ + chmod ug+r /etc/httpd/conf.d/app.conf && \ + rm -f /etc/httpd/conf.d/autoindex.conf && \ + rm -f /etc/httpd/conf.d/welcome.conf && \ + mkdir /data && \ + mkdir /data/www && \ + mkdir /data/logs +COPY ./ /data/www +RUN rm -f /data/www/Dockerfile /data/www/httpd.conf /data/www/run.sh EXPOSE 80 EXPOSE 443 -VOLUME ["/var/www/html", "/var/log/httpd"] -CMD ["/sx/httpd_run.sh"] \ No newline at end of file +VOLUME ["/data/www","/data/logs"] +CMD ["/bin/run.sh"] \ No newline at end of file -- cgit v1.2.3