summaryrefslogtreecommitdiffstats
path: root/Services/apache/Dockerfile
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-10-30 13:46:27 +0100
committerstartxfr <clarue@startx.fr>2016-10-30 13:46:27 +0100
commit20eb425e1ab95b9870fdf71f969c0d5189a09e9a (patch)
tree8a28a297df8d12da2e6b3bf74c5c05443dcfbc92 /Services/apache/Dockerfile
parent64011c6592a1f2c0d581b2bfe1f1d9f00ad1f7a6 (diff)
downloadphpmyadmin-20eb425e1ab95b9870fdf71f969c0d5189a09e9a.tar.gz
phpmyadmin-20eb425e1ab95b9870fdf71f969c0d5189a09e9a.tar.bz2
phpmyadmin-20eb425e1ab95b9870fdf71f969c0d5189a09e9a.tar.xz
phpmyadmin-20eb425e1ab95b9870fdf71f969c0d5189a09e9a.zip
remove duplicate action
Diffstat (limited to 'Services/apache/Dockerfile')
-rw-r--r--Services/apache/Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index f54f196..945bb0d 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -12,13 +12,12 @@ 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 /etc/httpd/conf.d/welcome.conf && \
+ rm -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/userdir.conf /etc/httpd/conf.d/welcome.conf && \
mkdir -p $DATA_PATH $APP_PATH $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_PATH $LOG_PATH && \
- rm -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/userdir.conf /etc/httpd/conf.d/welcome.conf
+ chown -R apache:apache $APP_PATH $DATA_PATH $LOG_PATH
EXPOSE 80 443
VOLUME [ $DATA_PATH , $LOG_PATH ]