InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use container status values from api

Browse Source 
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>
This commit is contained in:
Derek McGowan
2025-04-25 15:21:24 -07:00
parent 19e79906cb
commit 100102108b
15 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/kill.go
View File

@@ -9,6 +9,7 @@ import (
"time"
"github.com/containerd/log"
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events"
containerpkg "github.com/docker/docker/container"
"github.com/docker/docker/errdefs"
@@ -122,7 +123,7 @@ func (daemon *Daemon) killWithSignal(container *containerpkg.Container, stopSign
// But this prevents race conditions in processing the container.
ctx, cancel := context.WithTimeout(context.TODO(), time.Duration(container.StopTimeout())*time.Second)
defer cancel()
s := <-container.Wait(ctx, containerpkg.WaitConditionNotRunning)
s := <-container.Wait(ctx, containertypes.WaitConditionNotRunning)
if s.Err() != nil {
if err := daemon.handleContainerExit(container, nil); err != nil {
log.G(context.TODO()).WithFields(log.Fields{
@@ -177,7 +178,7 @@ func (daemon *Daemon) Kill(container *containerpkg.Container) error {
ctx, cancel := context.WithTimeout(context.Background(), waitTimeout)
defer cancel()
status := <-container.Wait(ctx, containerpkg.WaitConditionNotRunning)
status := <-container.Wait(ctx, containertypes.WaitConditionNotRunning)
if status.Err() == nil {
return nil
}
@@ -195,7 +196,7 @@ func (daemon *Daemon) Kill(container *containerpkg.Container) error {
ctx2, cancel2 := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel2()
if status := <-container.Wait(ctx2, containerpkg.WaitConditionNotRunning); status.Err() != nil {
if status := <-container.Wait(ctx2, containertypes.WaitConditionNotRunning); status.Err() != nil {
return errors.New("tried to kill container, but did not receive an exit event")
}
return nil