Refs #89605 - Upgrade to haproxy 1.8

Author: avoinea

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2017-12-05 (1.8-1.0)
+
+- Upgrade to haproxy 1.8
+
 ## 2017-11-30 (1.7-4.1)
 
 - bugfix add LOG_LEVEL to /etc/environment as well

haproxy/Dockerfile

@@ -1,7 +1,5 @@
-FROM haproxy:1.7
-MAINTAINER "Alin Voinea" <alin.voinea@eaudeweb.ro>
-
-
+FROM haproxy:1.8
+LABEL maintainer="EEA: IDM2 A-Team <eea-edw-a-team-alerts@googlegroups.com>"
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
@@ -19,9 +17,5 @@ RUN apt-get update \
  && sed -i '/cron.*/a local2.*                          \/proc\/1\/fd\/1' /etc/rsyslog.conf \
  && mv /docker-entrypoint.sh /haproxy-entrypoint.sh
 
-
-
 COPY src/haproxy.cfg            /tmp/
 COPY docker-entrypoint.sh src/configure.py src/track_hosts src/track_dns /
-
-

haproxy/Readme.md

@@ -4,16 +4,16 @@ This image is generic, thus you can obviously re-use it within
 your non-related EEA projects.
 
  - Debian: **Jessie**
- - HAProxy: **1.7**
+ - HAProxy: **1.8**
  - Expose: **5000**
 
 ### Supported tags and respective Dockerfile links
 
-  - `:latest` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/blob/master/haproxy/Dockerfile) - Debian: **Jessie**, HAProxy: **1.7**
+  - `:latest` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/blob/master/haproxy/Dockerfile) - Debian: **Jessie**, HAProxy: **1.8**
 
 ### Stable and immutable tags
 
-  - `:1.7-4.1` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/tree/1.7-4.1/haproxy/Dockerfile) - HAProxy: **1.7** Release: **4.1*
+  - `:1.8-1.0` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/tree/1.8-1.0/haproxy/Dockerfile) - HAProxy: **1.8 Release: **1*.0
 
 See [older versions](https://github.com/eea/eea.docker.haproxy/releases)