Use container status values from api #49874
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
thaJeztah
approved these changes
Apr 26, 2025
daemon/wait.go
Outdated
| @@ -13,7 +14,7 @@ import ( | |||
| // condition is met or if an error occurs waiting for the container (such as a | |||
| // context timeout or cancellation). On a successful wait, the exit code of the | |||
| // container is returned in the status with a non-nil Err() value. | |||
| func (daemon *Daemon) ContainerWait(ctx context.Context, name string, condition container.WaitCondition) (<-chan container.StateStatus, error) { | |||
| func (daemon *Daemon) ContainerWait(ctx context.Context, name string, condition containertypes.WaitCondition) (<-chan container.StateStatus, error) { | |||
There was a problem hiding this comment.
daemon/wait.go:17:119: SA1019: container.StateStatus is deprecated: use [container.StateStatus] instead. (staticcheck)
func (daemon *Daemon) ContainerWait(ctx context.Context, name string, condition containertypes.WaitCondition) (<-chan container.StateStatus, error) {
^
Suggested change
| func (daemon *Daemon) ContainerWait(ctx context.Context, name string, condition containertypes.WaitCondition) (<-chan container.StateStatus, error) { | |
| func (daemon *Daemon) ContainerWait(ctx context.Context, name string, condition containertypes.WaitCondition) (<-chan containertypes.StateStatus, error) { |
But it looks like this is the only remaining use of "github.com/docker/docker/container", so we could also remove the alias for the new import instead.
There was a problem hiding this comment.
I updated it to be consistent with the daemon package. Another followup change could be done to make them consistent across packages.
There was a problem hiding this comment.
Yeah, I later noticed that, so we can keep the alias; linting issue needs to be fixed though to make CI happy 😁
This was referenced Apr 26, 2025
Alias and deprecate the status types and constants from the root container package. The root container package is intended for use within the daemon and no the api package. Signed-off-by: Derek McGowan <derek@mcg.dev>
de5cb27 to
1001021
Compare
vvoland
approved these changes
Apr 28, 2025
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.
Alias and deprecate the status types and constants from the root container package. The root container package is intended for use within the daemon and no the api package.
This is a part of separating the dependency of api to non-api packages.
- Human readable description for the release notes