From a5f07d7adebabce05cecd27b14d32551035ddc5d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2020 13:35:18 +1100 Subject: [PATCH] [MISC] (deps): Bump haproxy from 2.2.4-alpine to 2.3.0-alpine in /internal/suites/example/compose/haproxy (#1431) * [MISC] (deps): Bump haproxy in /internal/suites/example/compose/haproxy Bumps haproxy from 2.2.4-alpine to 2.3.0-alpine. Signed-off-by: dependabot-preview[bot] * Fix HAProxy suite Looks like the new version of HAProxy has config validation which expects a newline at the bottom of `haproxy.cfg`. CI was failing with the following error: [NOTICE] 313/021816 (1) : haproxy version is 2.3.0-1c0a722 [ALERT] 313/021816 (1) : parsing [/usr/local/etc/haproxy/haproxy.cfg:80]: Missing LF on last line, file might have been truncated at position 42. [ALERT] 313/021816 (1) : Error(s) found in configuration file : /usr/local/etc/haproxy/haproxy.cfg [ALERT] 313/021816 (1) : Fatal errors found in configuration. Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Amir Zarrinkafsh --- internal/suites/example/compose/haproxy/Dockerfile | 2 +- internal/suites/example/compose/haproxy/haproxy.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/suites/example/compose/haproxy/Dockerfile b/internal/suites/example/compose/haproxy/Dockerfile index 76914ec16..785fb1760 100644 --- a/internal/suites/example/compose/haproxy/Dockerfile +++ b/internal/suites/example/compose/haproxy/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:2.2.4-alpine +FROM haproxy:2.3.0-alpine RUN \ apk add --no-cache \ diff --git a/internal/suites/example/compose/haproxy/haproxy.cfg b/internal/suites/example/compose/haproxy/haproxy.cfg index 8845973fe..793096324 100644 --- a/internal/suites/example/compose/haproxy/haproxy.cfg +++ b/internal/suites/example/compose/haproxy/haproxy.cfg @@ -77,4 +77,4 @@ backend be_mail server smtp-backend smtp:1080 backend be_protected - server nginx-backend nginx-backend:80 \ No newline at end of file + server nginx-backend nginx-backend:80