diff options
| author | startxfr <clarue@startx.fr> | 2015-11-28 19:46:13 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-11-28 19:46:13 +0100 |
| commit | 348568c89ae1ad19270e930c02a1492bc43e99b1 (patch) | |
| tree | 97514774d5c27789d9383f5085103eb9775b6a52 /Services/apache/Dockerfile | |
| parent | 05c9aa4a4d3572168878bf0e81eeac724a95454d (diff) | |
| download | phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.tar.gz phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.tar.bz2 phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.tar.xz phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.zip | |
Adding display of OS flavour at startup and improving flexibility of services with env param
Diffstat (limited to 'Services/apache/Dockerfile')
| -rw-r--r-- | Services/apache/Dockerfile | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile index 72a8ee8..24dc063 100644 --- a/Services/apache/Dockerfile +++ b/Services/apache/Dockerfile @@ -4,20 +4,25 @@ MAINTAINER Christophe LARUE <dev@startx.fr> USER root RUN dnf -y install httpd && \ dnf clean all -COPY httpd.conf /etc/httpd/conf.d/app.conf +ENV HTTPDCONF=/etc/httpd/conf.d/app.conf \ + STARTUPLOG=/data/logs/httpd/startup.log \ + LOG_PATH=/data/logs/httpd \ + APP_PATH=/data/httpd +COPY httpd.conf $HTTPDCONF COPY *.sh /bin/ RUN chmod 775 /bin/run.sh /bin/sx-httpd.sh && \ - chmod ug+r /etc/httpd/conf.d/app.conf && \ + chmod ug+r $HTTPDCONF && \ 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 /data/www/sx-httpd.sh && \ - chown -R apache:apache /data/www /data/logs + mkdir $APP_PATH && \ + mkdir /data/logs && \ + mkdir $LOG_PATH && \ + touch $STARTUPLOG +COPY ./ $APP_PATH +RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh $APP_PATH/sx-httpd.sh && \ + chown -R apache:apache $APP_PATH /data/logs -EXPOSE 80 -EXPOSE 443 -VOLUME ["/data/www","/data/logs"] +EXPOSE 80 443 +VOLUME [$APP_PATH,$LOG_PATH] CMD ["/bin/run.sh"]
\ No newline at end of file |