summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-06-11 18:12:49 +0200
committerstartxfr <clarue@startx.fr>2016-06-11 18:12:49 +0200
commit54f76c8ff6b31b331e2ef261a00e277e745587b1 (patch)
treec26dab061d801337d2479f48767de3be11977abc
parente5e1102fc476988ebe57d60d171f021abc26d169 (diff)
downloadphpmyadmin-54f76c8ff6b31b331e2ef261a00e277e745587b1.tar.gz
phpmyadmin-54f76c8ff6b31b331e2ef261a00e277e745587b1.tar.bz2
phpmyadmin-54f76c8ff6b31b331e2ef261a00e277e745587b1.tar.xz
phpmyadmin-54f76c8ff6b31b331e2ef261a00e277e745587b1.zip
change for logfile
-rw-r--r--Applications/phpmyadmin/Dockerfile4
-rw-r--r--Services/apache/Dockerfile4
-rw-r--r--Services/php/Dockerfile4
3 files changed, 3 insertions, 9 deletions
diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index 87562f8..8da6704 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -6,9 +6,7 @@ RUN cd $APP_PATH && \
unzip phpMyAdmin-4.5.2-all-languages.zip && \
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 &> /dev/null
+ rm -rf phpMyAdmin-4.5.2-all-languages
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 8e6e22c..b7b548f 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -14,9 +14,7 @@ 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 &> /dev/null
+ 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 && \
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index cc32e0e..4abb0f8 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -12,9 +12,7 @@ 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 &> /dev/null
+ chmod ug+r $HTTPDCONF
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 && \