summaryrefslogtreecommitdiffstats
path: root/adei/Dockerfile
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-02-22 03:47:37 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-02-22 03:47:37 +0100
commit2a32f59c055f76b3420726930a08a0a95474cc2c (patch)
tree75651f882b60fd485aa8004889ec128829ff9da8 /adei/Dockerfile
parent28879b78ddff075daf9d28f6389ecab9909c1de8 (diff)
downloadadei-2a32f59c055f76b3420726930a08a0a95474cc2c.tar.gz
adei-2a32f59c055f76b3420726930a08a0a95474cc2c.tar.bz2
adei-2a32f59c055f76b3420726930a08a0a95474cc2c.tar.xz
adei-2a32f59c055f76b3420726930a08a0a95474cc2c.zip
Simplify and add uid to /etc/passwd on startup to keep getpwuid() happy
Diffstat (limited to 'adei/Dockerfile')
-rw-r--r--adei/Dockerfile8
1 files changed, 5 insertions, 3 deletions
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