Skip to content
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

Jump to bottom

[Buildkite] Upgrade docker daemon #1802

Merged
merged 2 commits into from
May 2, 2024
Merged

[Buildkite] Upgrade docker daemon #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3ce805
Upgrade docker daemon
mrodm Apr 25, 2024
61ed34b
Update nginx config to listen in ipv6 too
mrodm Apr 25, 2024
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
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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