diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 42e868699..8b1702284 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ env: SETUP_GVM_VERSION: 'v0.5.1' # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151 ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true" DOCKER_COMPOSE_VERSION: "v2.24.1" - DOCKER_VERSION: "false" + DOCKER_VERSION: "26.1.0" KIND_VERSION: 'v0.20.0' K8S_VERSION: 'v1.29.0' LINUX_AGENT_IMAGE: "golang:${GO_VERSION}" diff --git a/.buildkite/scripts/install_deps.sh b/.buildkite/scripts/install_deps.sh index c4ed48873..57ccb3d55 100755 --- a/.buildkite/scripts/install_deps.sh +++ b/.buildkite/scripts/install_deps.sh @@ -64,9 +64,14 @@ with_docker() { fi echo "deb [arch=${architecture} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu ${ubuntu_codename} stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null sudo apt-get update - sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-downgrades -y "docker-ce=${debian_version}" - sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-downgrades -y "docker-ce-cli=${debian_version}" + sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-change-held-packages --allow-downgrades -y "docker-ce=${debian_version}" + sudo DEBIAN_FRONTEND=noninteractive apt-get install --allow-change-held-packages --allow-downgrades -y "docker-ce-cli=${debian_version}" sudo systemctl start docker + + echo "- Installed docker client version:" + docker version -f json | jq -r '.Client.Version' + echo "- Installed docker server version:" + docker version -f json | jq -r '.Server.Version' } with_docker_compose_plugin() { diff --git a/test/packages/parallel/nginx/_dev/deploy/docker/nginx.conf b/test/packages/parallel/nginx/_dev/deploy/docker/nginx.conf index f530f31a6..a69af3f01 100755 --- a/test/packages/parallel/nginx/_dev/deploy/docker/nginx.conf +++ b/test/packages/parallel/nginx/_dev/deploy/docker/nginx.conf @@ -20,6 +20,7 @@ http { access_log /var/log/nginx/access.log main; server { + listen [::]:80; listen 80; server_name localhost;