summaryrefslogtreecommitdiffstats
path: root/Services/apache/Dockerfile
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-06 16:41:23 +0100
committerstartxfr <clarue@startx.fr>2015-12-06 16:41:23 +0100
commit7fe1c9cf9f114d40fe3f534a3902f3dff73c602f (patch)
tree5d40c66b09a9eddab90ee209a71aa37eaed787cf /Services/apache/Dockerfile
parent6fc395ce332cf2565705b3a36bceaaa6f3948417 (diff)
downloadphpmyadmin-7fe1c9cf9f114d40fe3f534a3902f3dff73c602f.tar.gz
phpmyadmin-7fe1c9cf9f114d40fe3f534a3902f3dff73c602f.tar.bz2
phpmyadmin-7fe1c9cf9f114d40fe3f534a3902f3dff73c602f.tar.xz
phpmyadmin-7fe1c9cf9f114d40fe3f534a3902f3dff73c602f.zip
correcting bug and improve startup display
Diffstat (limited to 'Services/apache/Dockerfile')
-rw-r--r--Services/apache/Dockerfile12
1 files changed, 7 insertions, 5 deletions
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index 620add6..9682a0a 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -6,20 +6,22 @@ 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
+ LOG_PATH=/data/logs/apache \
+ APP_PATH=/data/apache \
+ TMP_APP_PATH=/tmp/apache
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 && \
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 $LOG_PATH
+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
EXPOSE 80 443
VOLUME [$APP_PATH,$LOG_PATH]