summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Applications/phpmyadmin/Dockerfile3
-rw-r--r--Services/apache/Dockerfile5
-rw-r--r--Services/php/Dockerfile2
3 files changed, 4 insertions, 6 deletions
diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index e4d7326..329e4e3 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -7,8 +7,7 @@ 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
-RUN mkdir /etc/httpd/logs && \
- chown -R apache:apache /etc/httpd/logs
+RUN mkdir /etc/httpd/logs && chown -R apache:apache /etc/httpd/logs
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 4e908ac..676842a 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -2,8 +2,7 @@ FROM startx/fedora
MAINTAINER Christophe LARUE <dev@startx.fr>
USER root
-RUN dnf -y install httpd && \
- dnf clean all
+RUN dnf -y install httpd && dnf clean all
ENV HTTPDCONF=/etc/httpd/conf.d/app.conf \
STARTUPLOG=/logs/startup.log \
LOG_PATH=/logs \
@@ -15,7 +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
+ touch $STARTUPLOG && mkdir /etc/httpd/logs && chown -R apache:apache /etc/httpd/logs
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 4abb0f8..0afe661 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -12,7 +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
+ chmod ug+r $HTTPDCONF && mkdir /etc/httpd/logs && chown -R apache:apache /etc/httpd/logs
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 && \