From dfe9895825ffbab23d9e8925b28282206d6678f8 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Wed, 21 Feb 2018 21:11:45 +0100
Subject: Move pid file to /tmp folder

---
 adei/Dockerfile            | 3 ++-
 adei/scripts/run-apache.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'adei')

diff --git a/adei/Dockerfile b/adei/Dockerfile
index 523e3c5..8ecaa2e 100644
--- a/adei/Dockerfile
+++ b/adei/Dockerfile
@@ -18,7 +18,6 @@ RUN zypper ar http://download.opensuse.org/repositories/home:/csa7fff:/adei/open
     zypper -n in make java && \
     zypper -n in adei adei-config-default adei-req-mssql adei-webroot
 
-VOLUME /var/run
 VOLUME /var/log/apache2
 VOLUME /var/spool/mail
 
@@ -40,11 +39,13 @@ RUN /opt/scripts/configure.sh
 RUN rm -rf /srv/www/htdocs/adei && \
     ln -s /adei/src /srv/www/htdocs/adei
 
+# Modify for non-priviledged mode
 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 && \
+    sed -i'' -re 's@/var/run@/tmp@' /usr/sbin/start_apache2 && \
     chmod +x /usr/sbin/start_apache2
 
 ENV MYSQL_SERVER adei-mysql
diff --git a/adei/scripts/run-apache.sh b/adei/scripts/run-apache.sh
index 1db3397..e7d894b 100755
--- a/adei/scripts/run-apache.sh
+++ b/adei/scripts/run-apache.sh
@@ -55,5 +55,5 @@ if [ -n "$APACHE_SERVERS" -a "$APACHE_SERVERS" -ne 0 ]; then
     [ $max_spare -eq 0 ] || sed -i'' -re "s/MaxSpareServers(.*)/MaxSpareServers $max_spare/" /etc/apache2/server-tuning.conf
 fi
 
-rm -f /var/run/httpd.pid
+rm -f /tmp/httpd.pid
 /usr/sbin/apache2ctl start -D FOREGROUND
-- 
cgit v1.2.3