Upgrade to haproxy 1.8.14

Author: valentinab25

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2018-11-21 (1.8-1.3)
+
+- Upgrade to haproxy 1.8.14
+- Move the restart of rsyslog and cron to run at every docker start
+
+
 ## 2018-08-02 (1.8-1.2)
 
 - Upgrade to haproxy 1.8.13

haproxy/Dockerfile

@@ -1,4 +1,4 @@
-FROM haproxy:1.8.13
+FROM haproxy:1.8.14
 LABEL maintainer="EEA: IDM2 A-Team <eea-edw-a-team-alerts@googlegroups.com>"
 
 RUN apt-get update \

haproxy/Readme.md

@@ -13,7 +13,7 @@ your non-related EEA projects.
 
 ### Stable and immutable tags
 
-  - `:1.8-1.2` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/tree/1.8-1.2/haproxy/Dockerfile) - HAProxy: **1.8** Release: **1.2**
+  - `:1.8-1.3` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/tree/1.8-1.3/haproxy/Dockerfile) - HAProxy: **1.8** Release: **1.3**
 
 See [older versions](https://github.com/eea/eea.docker.haproxy/releases)
 

haproxy/docker-entrypoint.sh

@@ -26,14 +26,9 @@ if ! test -e /etc/haproxy/haproxy.cfg; then
 
     fi
 
-    #enable cron logging
-    service rsyslog restart
-    
     #add crontab
     crontab /var/crontab.txt
     chmod 600 /etc/crontab
-    service cron restart
-    
 
     #Add env variables for haproxy
     echo "export PATH=$PATH"':$PATH' >> /etc/environment
@@ -63,5 +58,12 @@ if ! test -e /etc/haproxy/haproxy.cfg; then
     if [ ! -z "$TIMEOUT_SERVER" ]; then echo "export TIMEOUT_SERVER=\"$TIMEOUT_SERVER\""  >> /etc/environment; fi
 fi
 
+
+#start logging
+service rsyslog restart
+
+#start crontab
+service cron restart
+
 exec /haproxy-entrypoint.sh "$@"