Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(#9187): fix haproxy version to 2.6.17 - 4.8.x #9190

Merged
merged 2 commits into from
Jun 19, 2024
Merged

fix(#9187): fix haproxy version to 2.6.17 - 4.8.x #9190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f3ee09
fix(#9187): fix haproxy version to 2.6.17 (#9188)
dianabarsan Jun 19, 2024
a47fef3
skip waiting for "deployment complete"
dianabarsan Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(#9187): fix haproxy version to 2.6.17 (#9188) 
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
dianabarsan committed Jun 19, 2024
commit 6f3ee09fd00ac38f2ddf721f7b04641571d61c80
2 changes: 1 addition & 1 deletion haproxy/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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-all-k3d": "mocha --config tests/integration/.mocharc-k3d.js",
"ci-integration-sentinel": "mocha --config tests/integration/.mocharc-sentinel.js",
Expand Down