cleanup

Dockerfile

@@ -16,19 +16,19 @@ ENV APACHE_LOG_DIR /var/log/apache2
 ENV APACHE_LOCK_DIR /var/lock/apache2
 ENV APACHE_PID_FILE /var/run/apache2.pid
 
-RUN mkdir -p /var/log/apache2 && chown -R $APACHE_RUN_USER /var/log/apache2 && \
-    mkdir -p /var/run/apache2 && chown -R $APACHE_RUN_USER /var/run/apache2 && \
-    mkdir -p /var/lock/apache2 && chown -R $APACHE_RUN_USER /var/lock/apache2 && \
+RUN mkdir -p /var/log/apache2 && chown -R ${APACHE_RUN_USER} /var/log/apache2 && \
+mkdir -p /var/lock/apache2 && chown -R ${APACHE_RUN_USER} /var/lock/apache2 && \
+    mkdir -p /var/run/apache2 && chown -R ${APACHE_RUN_USER} /var/run/apache2 && \
     setcap 'cap_net_bind_service=+ep' /usr/sbin/apache2
 
 RUN rm -rf /var/www/html/*
 ADD . /var/www/html
-RUN chown -R $APACHE_RUN_USER /var/www/html
+RUN chown -R ${APACHE_RUN_USER} /var/www/html
 
-USER $APACHE_RUN_USER
+USER ${APACHE_RUN_USER}
 
-ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
-ADD docker-entrypoint.sh /docker-entrypoint.sh
+ADD config/apache-config.conf /etc/apache2/sites-enabled/000-default.conf
+ADD config/docker-entrypoint.sh /docker-entrypoint.sh
 
 EXPOSE 80
 

apache-config.conf → config/apache-config.conf

@@ -1,6 +1,7 @@
 <VirtualHost *:80>
+
   #ServerAdmin example@kit.edu
-  ServerName sds-status.kaas.kit.edu
+  #ServerName example.kit.edu
 
   DocumentRoot /var/www/html
 
@@ -12,7 +13,9 @@
       Allow from all
   </Directory>
 
-  #ErrorLog /dev/stderr
+  ErrorLog /dev/stderr
   #TransferLog /dev/stdout
 
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+
 </VirtualHost>

config/docker-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+#/usr/bin/id
+
+POLL_INTERVAL=${POLL_INTERVAL:-60}
+
+if [ ${POLL_INTERVAL} gt 0 ]; then
+    (
+        while true; do
+            [ -f poll_data.sh ] && echo "Polling data: $(date)" && ./poll_data.sh
+            sleep ${POLL_INTERVAL}
+        done
+    ) &
+fi
+
+echo "Starting server process"
+/usr/sbin/apache2ctl -D FOREGROUND $@

docker-entrypoint.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-/usr/bin/id
-
-(
-    sleep 10
-    while true; do
-        [ -f poll_data.sh ] && echo "Polling data." && ./poll_data.sh
-        sleep 60
-    done
-) &
-
-echo "Running apache server ..."
-/usr/sbin/apache2ctl -D FOREGROUND $@