Merge pull request #27 from MiniCodeMonkey/master

Updated from haproxy 1.9 to 2.0 and enabled logging to stdout

Author: pozgo

Dockerfile

@@ -1,7 +1,7 @@
 FROM centos:centos7
 
-ENV   HAPROXY_MJR_VERSION=1.9 \
-      HAPROXY_VERSION=1.9.2 \
+ENV   HAPROXY_MJR_VERSION=2.0 \
+      HAPROXY_VERSION=2.0.8 \
       HAPROXY_CONFIG='/etc/haproxy/haproxy.cfg' \
       HAPROXY_ADDITIONAL_CONFIG='' \
       HAPROXY_PRE_RESTART_CMD='' \
@@ -27,7 +27,7 @@ RUN \
   tar -zxvf /tmp/haproxy.tgz -C /tmp && \
   cd /tmp/haproxy-* && \
   make \
-    TARGET=linux2628 USE_LINUX_TPROXY=1 USE_ZLIB=1 USE_REGPARM=1 USE_PCRE=1 USE_PCRE_JIT=1 \
+    TARGET=linux-glibc USE_LINUX_TPROXY=1 USE_ZLIB=1 USE_REGPARM=1 USE_PCRE=1 USE_PCRE_JIT=1 \
     USE_OPENSSL=1 SSL_INC=/usr/include SSL_LIB=/usr/lib ADDLIB=-ldl \
     CFLAGS="-O2 -g -fno-strict-aliasing -DTCP_USER_TIMEOUT=18" && \
   make install && \

README.md

@@ -47,7 +47,6 @@ Example:
 
 ```bash
 docker run -ti \
-  --cap-add NET_ADMIN \
   -p 80:80 \
   -p 443:443 \
   million12/haproxy
@@ -57,7 +56,6 @@ docker run -ti \
 
 ```bash
 docker run -d \
-  --cap-add NET_ADMIN \
   -p 80:80 \
   -v /my-haproxy.cfg:/etc/haproxy/haproxy.cfg \
   million12/haproxy \
@@ -70,7 +68,6 @@ Note: in this case config is mounted to its default location, so you don't need
 
 ```bash
 docker run -d \
-  --cap-add NET_ADMIN \
   -p 80:80 \
   -e HAPROXY_ADDITIONAL_CONFIG='/etc/haproxy/custom1 /etc/haproxy/custom2' \
   million12/haproxy

container-files/bootstrap.sh

@@ -11,16 +11,9 @@ HAPROXY_POST_RESTART_CMD=${HAPROXY_POST_RESTART_CMD:=""}
 HAPROXY_USER_PARAMS=$@
 
 # Internal params
-HAPROXY_PID_FILE="/var/run/haproxy.pid"
-HAPROXY_CMD="/usr/local/sbin/haproxy -f ${HAPROXY_CONFIG} ${HAPROXY_USER_PARAMS} -D -p ${HAPROXY_PID_FILE}"
+HAPROXY_CMD="/usr/local/sbin/haproxy -f ${HAPROXY_CONFIG} -W ${HAPROXY_USER_PARAMS}"
 HAPROXY_CHECK_CONFIG_CMD="/usr/local/sbin/haproxy -f ${HAPROXY_CONFIG} -c"
 
-# Iptable commands
-LIST_IPTABLES="iptables --list"
-ENABLE_SYN_DROP="iptables -I INPUT -p tcp -m multiport --dport $HAPROXY_PORTS --syn -j DROP"
-DISABLE_SYN_DROP="iptables -D INPUT -p tcp -m multiport --dport $HAPROXY_PORTS --syn -j DROP"
-
-
 #######################################
 # Echo/log function
 # Arguments:
@@ -41,15 +34,6 @@ print_config() {
   printf '=%.0s' {1..100} && echo
 }
 
-# Check iptables rules modification capabilities
-$LIST_IPTABLES > /dev/null 2>&1
-# Exit immidiately in case of any errors
-if [[ $? != 0 ]]; then
-    EXIT_CODE=$?;
-    echo "Please enable NET_ADMIN capabilities by passing '--cap-add NET_ADMIN' parameter to docker run command";
-    exit $EXIT_CODE;
-fi
-
 # Launch HAProxy.
 # In the default attached haproxy.cfg `web.server` host is used for back-end nodes.
 # If that host doesn't exist in /etc/hosts, create it and point to localhost,
@@ -58,29 +42,26 @@ grep --silent -e "web.server" /etc/hosts || echo "127.0.0.1 web.server" >> /etc/
 
 log $HAPROXY_CMD && print_config
 $HAPROXY_CHECK_CONFIG_CMD
-$HAPROXY_CMD
-# Exit immidiately in case of any errors or when we have interactive terminal
+$HAPROXY_CMD &
+
+HAPROXY_PID=$!
+
+# Exit immediately in case of any errors or when we have interactive terminal
 if [[ $? != 0 ]] || test -t 0; then exit $?; fi
-log "HAProxy started with $HAPROXY_CONFIG config, pid $(cat $HAPROXY_PID_FILE)." && log
+log "HAProxy started with $HAPROXY_CONFIG config, pid $HAPROXY_PID." && log
 
 # Check if config has changed
 # Note: also monitor /etc/hosts where the new back-end hosts might be provided.
 while inotifywait -q -e create,delete,modify,attrib /etc/hosts $HAPROXY_CONFIG $HAPROXY_ADDITIONAL_CONFIG; do
-  if [ -f $HAPROXY_PID_FILE ]; then
-    log "Restarting HAProxy due to config changes..." && print_config
-    $HAPROXY_CHECK_CONFIG_CMD
-    $ENABLE_SYN_DROP
-    sleep 0.2
-    log "Executing pre-restart hook..."
-    $HAPROXY_PRE_RESTART_CMD
-    log "Restarting haproxy..."
-    $HAPROXY_CMD -sf $(cat $HAPROXY_PID_FILE)
-    log "Executing post-restart hook..."
-    $HAPROXY_POST_RESTART_CMD
-    $DISABLE_SYN_DROP
-    log "HAProxy restarted, pid $(cat $HAPROXY_PID_FILE)." && log
-  else
-    log "Error: no $HAPROXY_PID_FILE present, HAProxy exited."
-    break
-  fi
+  log "Restarting HAProxy due to config changes..." && print_config
+  $HAPROXY_CHECK_CONFIG_CMD
+  log "Executing pre-restart hook..."
+  $HAPROXY_PRE_RESTART_CMD
+  log "Restarting haproxy..."
+  $HAPROXY_CMD -sf $HAPROXY_PID &
+  HAPROXY_PID=$!
+  log "Got new PID: $HAPROXY_PID"
+  log "Executing post-restart hook..."
+  $HAPROXY_POST_RESTART_CMD
+  log "HAProxy restarted, pid $HAPROXY_PID." && log
 done