chore(deps): Upgrade Docker to v28.2.2 #26
Merged
Conversation
This file contains hidden or 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
- Update Docker dependency from v26.1.3 to v28.2.2+incompatible - Fix compilation error by migrating Config field to DockerOCIImageConfig - Replace container.Config with OCI-compliant image configuration - Preserve healthcheck, OnBuild, and Shell configurations in Docker extensions - Remove unused imports and simplify variable names - Maintain backward compatibility with deprecated ContainerConfig field
There was a problem hiding this comment.
Pull Request Overview
This PR upgrades the Docker dependency and migrates the image configuration to an OCI-compliant format while retaining backward compatibility.
- Updated dependency versions in go.mod
- Migrated from container.Config to DockerOCIImageConfig in the image router
- Removed unused variables and imports for cleanup
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| go.mod | Updated Docker and containerd dependencies alongside other minor updates |
| engine/image/router.go | Migrated image configuration to OCI-compliant format and simplified code by removing unused fields and imports |
Comments suppressed due to low confidence (3)
engine/image/router.go:102
- Consider adding a comment here to explain why exposedPorts has been converted to a map from nat.PortSet, which clarifies the intent for compatibility with DockerOCIImageConfig.
exposedPorts := map[string]struct{}{}
engine/image/router.go:112
- Please add an inline comment explaining the transformation of volumes into a map, so future maintainers understand its intended use in the OCI image configuration.
volumes := map[string]struct{}{}
go.mod:18
- Verify that replacing the dependency on containerd/containerd with containerd/errdefs is intentional and that it satisfies all indirect references within the project.
github.com/containerd/errdefs v1.0.0 // indirect
knqyf263
changed the title
knqyf263
requested review from
nikpivkin and
DmitriyLewen
and removed request for
nikpivkin
DmitriyLewen
approved these changes
Jun 16, 2025
engine/image/router.go
Outdated
| Healthcheck: healthcheck, | ||
| OnBuild: config.Config.OnBuild, | ||
| Shell: config.Config.Shell, | ||
| }, | ||
| } | ||
| inspect := types.ImageInspect{ |
There was a problem hiding this comment.
types.InspectResponse is deprecated. Use "github.com/docker/docker/api/types/image".
Suggested change
| inspect := types.ImageInspect{ | |
| inspect := image.InspectResponse{ |
knqyf263
added a commit
to knqyf263/trivy
that referenced
this pull request
Jun 16, 2025
This commit updates the daemon package to be compatible with Docker v28 by addressing breaking changes introduced in Docker API v1.46. Changes made: - Replace deprecated ImageInspectWithRaw with ImageInspect API - Remove deprecated container configuration fields from image config - Update dependencies to Docker v28.2.2 - Update testdocker to v0.0.0-20250616060700-ba6845ac6d17 which includes Docker v28 compatibility fixes (aquasecurity/testdocker#26) - Simplify imageConfig function to use only OCI-compliant fields Breaking changes addressed: Docker API v1.46 removed the following fields from image inspection Config: - Hostname, Domainname, AttachStdin, AttachStdout, AttachStderr - Tty, OpenStdin, StdinOnce, Image, NetworkDisabled, MacAddress These fields were implementation details and not part of the OCI image specification. The removal aligns Docker with the OCI standard. Test updates: - Update test expectations to match new API behavior - Remove assertions for deprecated fields that are no longer returned Fixes: Docker v28 compatibility issues
knqyf263
added a commit
to knqyf263/trivy
that referenced
this pull request
Jun 16, 2025
This commit updates the daemon package to be compatible with Docker v28 by addressing breaking changes introduced in Docker API v1.46. Changes made: - Replace deprecated ImageInspectWithRaw with ImageInspect API - Remove deprecated container configuration fields from image config - Update dependencies to Docker v28.2.2 - Update testdocker to v0.0.0-20250616060700-ba6845ac6d17 which includes Docker v28 compatibility fixes (aquasecurity/testdocker#26) - Simplify imageConfig function to use only OCI-compliant fields Breaking changes addressed: Docker API v1.46 removed the following fields from image inspection Config: - Hostname, Domainname, AttachStdin, AttachStdout, AttachStderr - Tty, OpenStdin, StdinOnce, Image, NetworkDisabled, MacAddress These fields were implementation details and not part of the OCI image specification. The removal aligns Docker with the OCI standard. Test updates: - Update test expectations to match new API behavior - Remove assertions for deprecated fields that are no longer returned Fixes: Docker v28 compatibility issues
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.
Summary
Changes