From 2a32f59c055f76b3420726930a08a0a95474cc2c Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Thu, 22 Feb 2018 03:47:37 +0100 Subject: Simplify and add uid to /etc/passwd on startup to keep getpwuid() happy --- adei/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'adei/Dockerfile') diff --git a/adei/Dockerfile b/adei/Dockerfile index 8ecaa2e..3556644 100644 --- a/adei/Dockerfile +++ b/adei/Dockerfile @@ -25,7 +25,6 @@ VOLUME /adei/src VOLUME /adei/cfg VOLUME /adei/tmp VOLUME /adei/sys -VOLUME /adei/ovr COPY supervisor/supervisord.conf /etc/supervisord.conf @@ -43,11 +42,14 @@ RUN rm -rf /srv/www/htdocs/adei && \ RUN ln -sf /etc/mime.types /etc/apache2/mime.types && \ find /etc/apache2 -type d -exec chmod +rx '{}' \; && \ chmod -R +r /etc/apache2 && \ - mv /etc/apache2 /opt/ && \ - ln -s /adei/ovr/apache2 /etc/apache2 && \ + chmod a+w /etc/apache2/listen.conf && \ + chmod a+w /etc/apache2/server-tuning.conf && \ sed -i'' -re 's@/var/run@/tmp@' /usr/sbin/start_apache2 && \ chmod +x /usr/sbin/start_apache2 +# Ugly python needs to resolve user name +RUN chmod g=u /etc/passwd + ENV MYSQL_SERVER adei-mysql ENV MYSQL_PORT 3306 ENV MYSQL_USER adei -- cgit v1.2.3