Skip to content

fix: restore with_docker_compose and detect legacy snapshot.yml for kubernetes-1.39 backport branch #21152

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

Merged
mrodm merged 2 commits into from
Sep 9, 2026
Merged

fix: restore with_docker_compose and detect legacy snapshot.yml for kubernetes-1.39 backport branch #21152

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
59443ad
fix: detect legacy snapshot.yml in is_stack_created
mrodm Sep 9, 2026
fbf68eb
fix: restore with_docker_compose to pin standalone binary for elastic…
mrodm Sep 9, 2026
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
Prev Previous commit
fix: restore with_docker_compose to pin standalone binary for elastic… 
…-package v0.79.0

The CI sync (#20542) replaced with_docker_compose (standalone binary
installed into BIN_FOLDER) with with_docker_compose_plugin (CLI plugin
installed into ~/.docker/cli-plugins). This caused elastic-package
v0.79.0, which hardcodes exec.Command("docker-compose", ...), to pick
up the system's docker-compose v2.24.7 (bundled with Docker 26.1.2)
instead of the pinned version.

Docker Compose v2.23+ changed the YAML output of `docker compose config`
so that the environment field is serialized as a sequence instead of a
map, which elastic-package v0.79.0 cannot unmarshal (map[string]string).

Restore with_docker_compose so the pinned standalone binary is placed
in BIN_FOLDER (first in PATH) and called before the system version.
Call it from test_one_package.sh and test_integrations_with_serverless.sh
alongside the existing plugin installation.

Restore the previous docker-compose version v2.17.2

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: add --fail to curl in with_docker_compose to enable retries on HTTP errors

Without --fail, curl exits 0 even on 4xx responses, saving the HTML
error body silently. This caused the docker-compose binary to contain
an HTML page, making it fail at execution time. With --fail, HTTP
errors produce a non-zero exit code so retry 5 can kick in properly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
  • Loading branch information
@mrodm @claude
mrodm and claude committed Sep 9, 2026
commit fbf68eb4a3f5baa928d930ed2408982f8cb3c54b
2 changes: 1 addition & 1 deletion .buildkite/pipeline.publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
env:
SETUP_GVM_VERSION: "v0.6.0"
LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"
DOCKER_COMPOSE_VERSION: "v2.24.1"
DOCKER_COMPOSE_VERSION: "v2.17.2"
DOCKER_VERSION: "false"
YQ_VERSION: 'v4.35.2'
JQ_VERSION: '1.7'
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline.serverless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
env:
SETUP_GVM_VERSION: "v0.6.0"
LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"
DOCKER_COMPOSE_VERSION: "v2.24.1"
DOCKER_COMPOSE_VERSION: "v2.17.2"
DOCKER_VERSION: "false" # not required to set since system tests are not running yet
KIND_VERSION: 'v0.20.0'
K8S_VERSION: 'v1.28.0'
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
env:
SETUP_GVM_VERSION: "v0.6.0"
DOCKER_COMPOSE_VERSION: "v2.24.1"
DOCKER_COMPOSE_VERSION: "v2.17.2"
DOCKER_VERSION: "26.1.2"
KIND_VERSION: 'v0.20.0'
K8S_VERSION: 'v1.28.0'
Expand Down
10 changes: 10 additions & 0 deletions .buildkite/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,16 @@ with_docker() {
docker version -f json | jq -r '.Server.Version'
}

with_docker_compose() {
create_bin_folder
check_platform_architecture

echo "--- Setting up the Docker-compose environment..."
retry 5 curl -sSL --fail -o "${BIN_FOLDER}/docker-compose" "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-${platform_type_lowercase}-${hw_type}"
chmod +x "${BIN_FOLDER}/docker-compose"
docker-compose version
}
Comment on lines +191 to +199

with_docker_compose_plugin() {
echo "--- Setting up the Docker compose plugin environment..."
if [[ "${DOCKER_COMPOSE_VERSION:-"false"}" == "false" ]]; then
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/test_integrations_with_serverless.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ add_bin_path
with_yq
with_mage
with_docker
with_docker_compose
with_docker_compose_plugin
with_kubernetes

Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/test_one_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ add_bin_path
with_yq
with_mage
with_docker
with_docker_compose
with_docker_compose_plugin
with_kubernetes

Expand Down
Loading