From d112a28b1b9a5e48aa6dddd7a8ea969c1698896e Mon Sep 17 00:00:00 2001 From: Holger Frey Date: Mon, 23 Aug 2021 11:58:51 +0200 Subject: [PATCH] trying to get rid of segfault --- Dockerfile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3038d22..0008ef8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,27 +18,26 @@ RUN apk add --no-cache apache2 apache2-utils apache2-webdav mod_dav_svn subversi ADD dav_svn.conf /etc/apache2/conf.d/dav_svn.conf # create writable directory for dav lock file -RUN mkdir /var/lib/dav/ -RUN chown deploy:deploy /var/lib/dav/ +#RUN mkdir /var/lib/dav/ +#RUN chown deploy:deploy /var/lib/dav/ # apache should run as user deploy -RUN sed -i.bak -r 's/(User|Group) apache/\1 deploy/' /etc/apache2/httpd.conf +#RUN sed -i.bak -r 's/(User|Group) apache/\1 deploy/' /etc/apache2/httpd.conf RUN sed -i.bak 's/#ServerName www.example.com:80/ServerName svn.cpi.imtek.uni-freiburg.de:80/' /etc/apache2/httpd.conf RUN sed -i.bak 's/LogLevel warn/LogLevel debug/' /etc/apache2/httpd.conf -RUN sed -i.bak 's/#LoadModule deflate_module/LoadModule deflate_module/' /etc/apache2/httpd.conf -RUN sed -i.bak 's/#LoadModule logio_module/LoadModule logio_module/' /etc/apache2/httpd.conf -RUN sed -i.bak 's/#LoadModule watchdog_module/CoreDumpDirectory \/tmp/' /etc/apache2/httpd.conf +#RUN sed -i.bak 's/#LoadModule deflate_module/LoadModule deflate_module/' /etc/apache2/httpd.conf +#RUN sed -i.bak 's/#LoadModule logio_module/LoadModule logio_module/' /etc/apache2/httpd.conf # copy the script to run httpd in foreground COPY httpd-foreground /usr/local/bin/ -RUN chown deploy:deploy /usr/local/bin/httpd-foreground +#RUN chown deploy:deploy /usr/local/bin/httpd-foreground RUN chmod u+x /usr/local/bin/httpd-foreground # setup the right permissions for deploy user -RUN chown -R deploy:deploy /var/www/ -RUN chown -R deploy:deploy /usr/lib/apache2/ -RUN chown -R deploy:deploy /run/apache2/ -RUN chown -R deploy:deploy /var/log/apache2/ +#RUN chown -R deploy:deploy /var/www/ +#RUN chown -R deploy:deploy /usr/lib/apache2/ +#RUN chown -R deploy:deploy /run/apache2/ +#RUN chown -R deploy:deploy /var/log/apache2/ -USER deploy +#USER deploy CMD ["httpd-foreground"] \ No newline at end of file