From e5e1102fc476988ebe57d60d171f021abc26d169 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 11 Jun 2016 18:04:21 +0200
Subject: change for logfile
---
Applications/phpmyadmin/Dockerfile | 3 ++-
Services/apache/Dockerfile | 4 +++-
Services/php/Dockerfile | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index c364efc..87562f8 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -7,7 +7,8 @@ RUN cd $APP_PATH && \
rm -f phpMyAdmin-4.5.2-all-languages.zip && \
mv phpMyAdmin-4.5.2-all-languages/* ./ && \
rm -rf phpMyAdmin-4.5.2-all-languages && \
- mkdir /etc/httpd/logs &> /dev/null && chown -R apache:apache /etc/httpd/logs
+ mkdir /etc/httpd/logs &> /dev/null && \
+ chown -R apache:apache /etc/httpd/logs &> /dev/null
COPY config.inc.php $APP_PATH/config.inc.php
COPY test.php $APP_PATH/test.php
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index b207fc4..8e6e22c 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -14,7 +14,9 @@ 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 && \
mkdir -p $DATA_PATH $APP_PATH $LOG_PATH && \
- touch $STARTUPLOG && mkdir /etc/httpd/logs &> /dev/null && chown -R apache:apache /etc/httpd/logs
+ touch $STARTUPLOG && \
+ mkdir /etc/httpd/logs &> /dev/null && \
+ chown -R apache:apache /etc/httpd/logs &> /dev/null
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 && \
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index d530396..cc32e0e 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -12,7 +12,9 @@ COPY httpd.conf $HTTPDCONF
COPY php.ini /etc/php.d/sx.ini
COPY run.sh /bin/
RUN chmod 775 /bin/run.sh && \
- chmod ug+r $HTTPDCONF && mkdir /etc/httpd/logs &> /dev/null && chown -R apache:apache /etc/httpd/logs
+ chmod ug+r $HTTPDCONF && \
+ mkdir /etc/httpd/logs &> /dev/null && \
+ chown -R apache:apache /etc/httpd/logs &> /dev/null
COPY ./ $APP_PATH
RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh && \
chown -R apache:apache $DATA_PATH $APP_PATH $LOG_PATH && \
--
cgit v1.2.3