Skip to content

Commit

Permalink
fix(#9187): fix haproxy version to 2.6.17 (#9188)
Browse files Browse the repository at this point in the history
Haproxy published a new 2.6.18 image today, which breaks one of our unit tests. It might also break behavior.
Fixing the image version to 2.6.17 resolves the issue and makes sure we're having expected behavior.

#9187

(cherry picked from commit 020c3c3)
  • Loading branch information
dianabarsan committed Jun 19, 2024
1 parent 27b3369 commit 5842470
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion haproxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haproxy:2.6
FROM haproxy:2.6.17

USER root
RUN apt-get update && apt-get install luarocks gettext jq curl -y
Expand Down
1 change: 0 additions & 1 deletion haproxy/tests/compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
haproxy:
build:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default/wdio.conf.js",
"-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",
"build": "./scripts/build/build-ci.sh",
"ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run build && npm run integration-api && npm run unit && npm run unit-nginx && npm run unit-haproxy && npm run unit-haproxy-healthcheck",
"ci-compile": "node scripts/ci/check-versions.js && node scripts/build/cli npmCiModules && npm run lint && npm run unit-nginx && npm run unit-haproxy && npm run unit-haproxy-healthcheck && npm run build && npm run integration-api && npm run unit",
"ci-integration-all": "mocha --config tests/integration/.mocharc-all.js",
"ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
"ci-webdriver-default": "wdio run ./tests/e2e/default/wdio.conf.js",
Expand Down

0 comments on commit 5842470

Please sign in to comment.