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

api/types/container: move container options to client

Browse Source 
Move the option-types to the client and in some cases create a
copy for the backend. These types are used to construct query-
args, and not marshaled to JSON, and can be replaced with functional
options in the client.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-09-04 17:41:39 +02:00
parent 291e129631
commit 4d20b6fe56
137 changed files with 743 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/daemon.go
View File

@@ -1247,7 +1247,6 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
layer.ReleaseAndLog(imgSvcConfig.LayerStore, l)
}
}
}
if totalSize <= migrationThreshold {
@@ -1417,7 +1416,7 @@ func (daemon *Daemon) shutdownContainer(c *container.Container) error {
ctx := context.WithoutCancel(context.TODO())
// If container failed to exit in stopTimeout seconds of SIGTERM, then using the force
if err := daemon.containerStop(ctx, c, containertypes.StopOptions{}); err != nil {
if err := daemon.containerStop(ctx, c, backend.ContainerStopOptions{}); err != nil {
return fmt.Errorf("Failed to stop container %s with error: %v", c.ID, err)
}
@@ -1469,7 +1468,7 @@ func (daemon *Daemon) Shutdown(ctx context.Context) error {
cfg := &daemon.config().Config
if cfg.LiveRestoreEnabled && daemon.containers != nil {
// check if there are any running containers, if none we should do some cleanup
if ls, err := daemon.Containers(ctx, &containertypes.ListOptions{}); len(ls) != 0 || err != nil {
if ls, err := daemon.Containers(ctx, &backend.ContainerListOptions{}); len(ls) != 0 || err != nil {
// metrics plugins still need some cleanup
metrics.CleanupPlugin(daemon.PluginStore)
return err