Skip to content

Commit

Permalink
[Buildkite] Upgrade docker daemon (#1802)
Browse files Browse the repository at this point in the history
Upgrade docker daemon to the current latest version (26.1.0).
In order to be able to do this upgrade, the configuration in test
nginx package must be updated to allow listening in ipv6 too.
  • Loading branch information
mrodm authored May 2, 2024
1 parent 56640d0 commit 45b0921
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
9 changes: 7 additions & 2 deletions .buildkite/scripts/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions test/packages/parallel/nginx/_dev/deploy/docker/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ http {
access_log /var/log/nginx/access.log main;

server {
listen [::]:80;
listen 80;
server_name localhost;

Expand Down

0 comments on commit 45b0921

Please sign in to comment.