From 320730347e1e13cd71fa0e40b380fbecd0ecfc9a Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Thu, 25 Apr 2024 15:28:50 +0200 Subject: [PATCH 1/3] Test with docker 26.1.0 --- .buildkite/pipeline.yml | 2 +- .buildkite/scripts/common.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index df3e5f0c778..8300559ba33 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -4,7 +4,7 @@ env: SETUP_GVM_VERSION: "v0.5.2" LINUX_AGENT_IMAGE: "golang:${GO_VERSION}" DOCKER_COMPOSE_VERSION: "v2.24.1" - DOCKER_VERSION: "false" + DOCKER_VERSION: "26.1.0" KIND_VERSION: 'v0.20.0' K8S_VERSION: 'v1.29.0' YQ_VERSION: 'v4.35.2' diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh index deccf8aaac8..299b96c03e8 100755 --- a/.buildkite/scripts/common.sh +++ b/.buildkite/scripts/common.sh @@ -162,9 +162,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() { From 96bca418f88b20440d6de6e9787d3d508ac64dea Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Thu, 25 Apr 2024 19:13:57 +0200 Subject: [PATCH 2/3] Update nginx config to listen in ipv6 too --- packages/nginx/_dev/deploy/docker/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/nginx/_dev/deploy/docker/nginx.conf b/packages/nginx/_dev/deploy/docker/nginx.conf index f530f31a640..a69af3f0109 100755 --- a/packages/nginx/_dev/deploy/docker/nginx.conf +++ b/packages/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; From fb5d652d0dc565416572c6a1ca8e3c43f18e2346 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Fri, 26 Apr 2024 14:24:05 +0200 Subject: [PATCH 3/3] Revert "Update nginx config to listen in ipv6 too" This reverts commit 96bca418f88b20440d6de6e9787d3d508ac64dea. --- packages/nginx/_dev/deploy/docker/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/nginx/_dev/deploy/docker/nginx.conf b/packages/nginx/_dev/deploy/docker/nginx.conf index a69af3f0109..f530f31a640 100755 --- a/packages/nginx/_dev/deploy/docker/nginx.conf +++ b/packages/nginx/_dev/deploy/docker/nginx.conf @@ -20,7 +20,6 @@ http { access_log /var/log/nginx/access.log main; server { - listen [::]:80; listen 80; server_name localhost;