summaryrefslogtreecommitdiffstats
path: root/Services/apache/Dockerfile
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-02-06 05:05:57 +0100
committerstartxfr <clarue@startx.fr>2016-02-06 05:05:57 +0100
commit5cff390c081bdfb756a8977ad0bd56d778202d6b (patch)
treece018b9be9ad054e4f7aa6891d7b4668c1ad74af /Services/apache/Dockerfile
parent0f3bcf30ae748a75c22a03d4655dba4d8dc71185 (diff)
downloadphpmyadmin-5cff390c081bdfb756a8977ad0bd56d778202d6b.tar.gz
phpmyadmin-5cff390c081bdfb756a8977ad0bd56d778202d6b.tar.bz2
phpmyadmin-5cff390c081bdfb756a8977ad0bd56d778202d6b.tar.xz
phpmyadmin-5cff390c081bdfb756a8977ad0bd56d778202d6b.zip
reorg avec gestion des sig
Diffstat (limited to 'Services/apache/Dockerfile')
-rw-r--r--Services/apache/Dockerfile23
1 files changed, 10 insertions, 13 deletions
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index 9682a0a..78e7cdc 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -5,24 +5,21 @@ USER root
RUN dnf -y install httpd && \
dnf clean all
ENV HTTPDCONF=/etc/httpd/conf.d/app.conf \
- STARTUPLOG=/data/logs/apache/startup.log \
- LOG_PATH=/data/logs/apache \
- APP_PATH=/data/apache \
- TMP_APP_PATH=/tmp/apache
+ STARTUPLOG=/logs/startup.log \
+ LOG_PATH=/logs \
+ APP_PATH=/app \
+ DATA_PATH=/data
COPY httpd.conf $HTTPDCONF
COPY *.sh /bin/
RUN chmod 775 /bin/run.sh /bin/sx-httpd.sh && \
chmod ug+r $HTTPDCONF && \
- rm -f /etc/httpd/conf.d/autoindex.conf && \
- rm -f /etc/httpd/conf.d/welcome.conf && \
- mkdir -p $TMP_APP_PATH && \
- mkdir -p $APP_PATH && \
- mkdir -p $LOG_PATH && \
+ rm -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/welcome.conf && \
+ mkdir -p $DATA_PATH $APP_PATH $LOG_PATH && \
touch $STARTUPLOG
-COPY ./ $TMP_APP_PATH
-RUN rm -f $TMP_APP_PATH/Dockerfile $TMP_APP_PATH/httpd.conf $TMP_APP_PATH/run.sh $TMP_APP_PATH/sx-httpd.sh && \
- chown -R apache:apache $TMP_APP_PATH $APP_PATH $LOG_PATH
+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_PATH $LOG_PATH
EXPOSE 80 443
-VOLUME [$APP_PATH,$LOG_PATH]
+VOLUME [$DATA_PATH,$LOG_PATH]
CMD ["/bin/run.sh"] \ No newline at end of file