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.

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

[25.0 backport] Dockerfile: update docker-cli to v25.0.2, docker compose v2.24.5 #47316

Merged
merged 4 commits into from Feb 5, 2024

Conversation

thaJeztah
Copy link
Member

backport of:


Dockerfile: update dev-shell version of the cli to v25.0.1

Update the docker CLI that's available for debugging in the dev-shell
to the v25 release.

Dockerfile: update docker compose to v2.24.3

Update the version of compose used in CI to the latest version.

Dockerfile: update dev-shell version of the cli to v25.0.2

Update the docker CLI that's available for debugging in the dev-shell
to the v25 release.

full diff: docker/cli@v25.0.1...v25.0.2

Dockerfile: update docker compose to v2.24.5

Update the version of compose used in CI to the latest version.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Update the docker CLI that's available for debugging in the dev-shell
to the v25 release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3eb1527)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Update the version of compose used in CI to the latest version.

- full diff: docker/compose@v2.24.2...v2.24.3
- release notes: https://github.com/docker/compose/releases/tag/v2.24.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 388ba9a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Update the docker CLI that's available for debugging in the dev-shell
to the v25 release.

full diff: docker/cli@v25.0.1...v25.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9c92c07)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Update the version of compose used in CI to the latest version.

- full diff: docker/compose@v2.24.3...v2.24.5
- release notes: https://github.com/docker/compose/releases/tag/v2.24.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 10d6f52)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

The other flaky test that we should really fix 😂

=== Failed
=== FAIL: amd64.integration.system TestDiskUsage/empty (0.00s)
    disk_usage_test.go:41: assertion failed: 
        --- du
        +++ →
          types.DiskUsage{
        - 	LayersSize: 4096,
        + 	LayersSize: 0,
          	Images:     {},
          	Containers: {},
          	... // 3 identical fields
          }
        
    --- FAIL: TestDiskUsage/empty (0.00s)

=== FAIL: amd64.integration.system TestDiskUsage (2.63s)

@thaJeztah thaJeztah merged commit 6010371 into moby:25.0 Feb 5, 2024
126 checks passed
@thaJeztah thaJeztah deleted the 25.0_backport_update_dev_cli_compose branch February 5, 2024 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants