Update to docker v25 #3759
Merged
Update to docker v25 #3759
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bcressey
reviewed
Feb 5, 2024
packages/docker-engine/0001-Change-default-capabilities-using-daemon-config.patch
Show resolved
Hide resolved
As part of this update, the package `docker-proxy` was removed since starting with docker 22 the sources of the `libnetwork` are vended through the moby repository. Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
This is to match the version of the docker-engine package Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
This is the version that introduced support for Docker 25 Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
arnaldo2792
force-pushed
the
ecs-docker-update
branch
from
7727e5b
to
a3c24b2
Compare
|
Forced push includes:
|
yeazelm
approved these changes
Feb 5, 2024
ginglis13
approved these changes
Feb 5, 2024
bcressey
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Closes #3756
Description of changes:
This PR updates to Docker v25 and the ECS agent to 1.81.0, since this is the version where v25 support was implemented. The patch to support Bottlerocket's OCI capabilities API was refactored to work with the new Docker version. The logic is the same, but the structures used by Docker changed slightly.
Two clarifications were added to the
clarify.tomlfile fordocker-enginesince two of the v25's dependencies' licenses were not identified by thelicense-tool. I checked each library's repository to confirm the licenses.Testing done:
In both aws-ecs-1 and aws-ecs-2 x86_64, I validated that the internal testing suite ran successfully.
In both aws-ecs-1 and aws-ecs-2 x86_64, I validated the OCI capabilities set in the API are applied in the container's configuration.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.