diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile index 4584a7ec5a2..d0149d979f6 100644 --- a/haproxy/Dockerfile +++ b/haproxy/Dockerfile @@ -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 diff --git a/haproxy/tests/compose.yml b/haproxy/tests/compose.yml index a8fa4350ed0..9831aadf414 100644 --- a/haproxy/tests/compose.yml +++ b/haproxy/tests/compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: haproxy: build: diff --git a/package.json b/package.json index db40eff8bf8..3ab4b312503 100644 --- a/package.json +++ b/package.json @@ -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",