Upgrade haproxy to 1.8.22

Author: valentinab25

CHANGELOG.md

@@ -1,10 +1,11 @@
 # Changelog
 
-## 2019-11-15 (1.8-1.4)
+## 2019-11-22 (1.8-1.4)
 
-- Fix BACKENDS_MODE typo, not reading the correct env var.
-- Only enable /track_hosts cron when BACKENDS env var is not present. Otherwise /track_hosts cron script will overwrite and mess up our backends
-- Only add http check option when backend is of type http, otherwise will break tcp backends.
+- Upgrade HAproxy to 1.8.22
+- Fix BACKENDS_MODE typo, set the default values of FRONTEND_MODE and BACKENDS_MODE to depend on each other
+- Only enable /track_hosts cron when BACKENDS and DNS_ENABLED env vars are not present. 
+- Only add http check option when backend is of type http.
 
 ## 2018-11-21 (1.8-1.3)
 

haproxy/Dockerfile

@@ -1,4 +1,4 @@
-FROM haproxy:1.8.14
+FROM haproxy:1.8.22
 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.3` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/tree/1.8-1.3/haproxy/Dockerfile) - HAProxy: **1.8** Release: **1.3**
+  - `:1.8-1.4` [*Dockerfile*](https://github.com/eea/eea.docker.haproxy/tree/1.8-1.4/haproxy/Dockerfile) - HAProxy: **1.8** Release: **1.3**
 
 See [older versions](https://github.com/eea/eea.docker.haproxy/releases)
 

haproxy/src/configure.py

@@ -10,7 +10,7 @@
 
 FRONTEND_NAME = os.environ.get('FRONTEND_NAME', 'http-frontend')
 FRONTEND_PORT = os.environ.get('FRONTEND_PORT', '5000')
-FRONTEND_MODE = os.environ.get('FRONTEND_MODE', 'http')
+FRONTEND_MODE = os.environ.get('FRONTEND_MODE', os.environ.get('BACKENDS_MODE','http'))
 BACKEND_NAME = os.environ.get('BACKEND_NAME', 'http-backend')
 BALANCE = os.environ.get('BALANCE', 'roundrobin')
 SERVICE_NAMES = os.environ.get('SERVICE_NAMES', '')
@@ -20,7 +20,7 @@
 STATS_AUTH = os.environ.get('STATS_AUTH', 'admin:admin')
 BACKENDS = os.environ.get('BACKENDS', '').split(' ')
 BACKENDS_PORT = os.environ.get('BACKENDS_PORT', '80')
-BACKENDS_MODE = os.environ.get('BACKENDS_MODE', 'http')
+BACKENDS_MODE = os.environ.get('BACKENDS_MODE', FRONTEND_MODE)
 LOGGING = os.environ.get('LOGGING', '127.0.0.1')
 LOG_LEVEL = os.environ.get('LOG_LEVEL', 'notice')
 TIMEOUT_CONNECT = os.environ.get('TIMEOUT_CONNECT', '5000')