summaryrefslogtreecommitdiffstats
path: root/Services
diff options
context:
space:
mode:
Diffstat (limited to 'Services')
-rw-r--r--Services/apache/Dockerfile5
-rw-r--r--Services/php/Dockerfile2
2 files changed, 3 insertions, 4 deletions
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 && \