From c876790f0819026c061c1b6cc4d27fdfd3df2a4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:56:24 +0200 Subject: Bump github.com/docker/docker from 24.0.9+incompatible to 25.0.6+incompatible (#3405) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.9+incompatible to 25.0.6+incompatible.
Release notes

Sourced from github.com/docker/docker's releases.

v25.0.6

25.0.6

For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:

Security

This release contains a fix for CVE-2024-41110 / GHSA-v23v-6jw2-98fq that impacted setups using authorization plugins (AuthZ) for access control.

Bug fixes and enhancements

Packaging updates

Full Changelog: https://github.com/moby/moby/compare/v25.0.5...v25.0.6

v25.0.5

25.0.5

For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:

Security

This release contains a security fix for CVE-2024-29018, a potential data exfiltration from 'internal' networks via authoritative DNS servers.

Bug fixes and enhancements

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/docker/docker&package-manager=go_modules&previous-version=24.0.9+incompatible&new-version=25.0.6+incompatible)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/matrix-org/dendrite/network/alerts).
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Till Faelligen <2353100+S7evinK@users.noreply.github.com> --- cmd/dendrite-upgrade-tests/main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go index 6390666a..871a605d 100644 --- a/cmd/dendrite-upgrade-tests/main.go +++ b/cmd/dendrite-upgrade-tests/main.go @@ -408,7 +408,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI } containerID = body.ID - err = dockerClient.ContainerStart(ctx, containerID, types.ContainerStartOptions{}) + err = dockerClient.ContainerStart(ctx, containerID, container.StartOptions{}) if err != nil { return "", "", fmt.Errorf("failed to ContainerStart: %s", err) } @@ -440,7 +440,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI lastErr = nil break } - logs, err := dockerClient.ContainerLogs(context.Background(), containerID, types.ContainerLogsOptions{ + logs, err := dockerClient.ContainerLogs(context.Background(), containerID, container.LogsOptions{ ShowStdout: true, ShowStderr: true, Follow: true, @@ -461,7 +461,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI } func destroyContainer(dockerClient *client.Client, containerID string) { - err := dockerClient.ContainerRemove(context.TODO(), containerID, types.ContainerRemoveOptions{ + err := dockerClient.ContainerRemove(context.TODO(), containerID, container.RemoveOptions{ Force: true, }) if err != nil { @@ -548,7 +548,7 @@ func verifyTests(dockerClient *client.Client, volumeName string, versions []*sem // cleanup old containers/volumes from a previous run func cleanup(dockerClient *client.Client) { // ignore all errors, we are just cleaning up and don't want to fail just because we fail to cleanup - containers, _ := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{ + containers, _ := dockerClient.ContainerList(context.Background(), container.ListOptions{ Filters: label(dendriteUpgradeTestLabel), All: true, }) @@ -556,7 +556,7 @@ func cleanup(dockerClient *client.Client) { log.Printf("Removing container: %v %v\n", c.ID, c.Names) timeout := 1 _ = dockerClient.ContainerStop(context.Background(), c.ID, container.StopOptions{Timeout: &timeout}) - _ = dockerClient.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{ + _ = dockerClient.ContainerRemove(context.Background(), c.ID, container.RemoveOptions{ Force: true, }) } -- cgit v1.2.3