Fixes logging and restart nicely of HAproxy

dockerfiles/load-balancer/confd/Dockerfile

@@ -16,7 +16,7 @@ RUN \
   chmod +x confd
 
 RUN \
-  wget https://get.docker.com/builds/Linux/x86_64/docker-1.2.0 -O docker && \
+  wget https://get.docker.com/builds/Linux/x86_64/docker-1.5.0 -O docker && \
   chmod +x docker
 
 ENTRYPOINT ["/confd"]

dockerfiles/load-balancer/confd/confd/conf.d/crt-list.toml

@@ -4,4 +4,5 @@ dest = "/etc/haproxy/crt-list"
 keys = [
   "/services"
 ]
-reload_cmd = "/docker kill --signal=\"SIGUSR1\" haproxy"
+reload_cmd = "/docker exec haproxy service haproxy reload"
+

dockerfiles/load-balancer/confd/confd/conf.d/haproxy.toml

@@ -4,4 +4,5 @@ dest = "/etc/haproxy/haproxy.cfg"
 keys = [
   "/services"
 ]
-reload_cmd = "/docker kill --signal=\"SIGUSR1\" haproxy"
+reload_cmd = "/docker exec haproxy service haproxy reload"
+

dockerfiles/load-balancer/haproxy/Dockerfile

@@ -5,11 +5,14 @@ ENV DEBIAN_FRONTEND noninteractive
 # Install Haproxy.
 RUN \
   apt-get update && \
-  apt-get install -y haproxy && \
+  apt-get install -y \
+    haproxy \
+    rsyslog && \
   rm -rf /var/lib/apt/lists/*
 
-ENTRYPOINT ["haproxy"]
-CMD ["-f", "/etc/haproxy/haproxy.cfg"]
+ADD run.sh /run.sh
+
+CMD ["/run.sh"]
 EXPOSE 80
 EXPOSE 443
 

dockerfiles/load-balancer/haproxy/run.sh

+#!/bin/bash -e
+
+function cleanup {
+  /etc/init.d/haproxy stop
+  /etc/init.d/rsyslog stop
+  exit 0
+}
+
+# start haproxy in bg and tail logs out to stdout
+/usr/sbin/service rsyslog start
+/etc/init.d/haproxy start
+tail -f /var/log/syslog &
+tail -f /var/log/haproxy.log &
+
+trap cleanup SIGTERM SIGINT
+
+while true; do # Iterate to keep job running.
+  sleep 1 # Don't sleep too long as signals will not be handled during sleep.
+done
+

unit-files/haproxy.service

@@ -17,7 +17,6 @@ ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
   --rm \
   --name %p \
-  -v /data/runtime/dev/log:/dev/log \
   -v /data/runtime/haproxy:/etc/haproxy \
   -p 80:80 \
   -p 443:443 \