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

7
integration/daemon/migration_test.go
View File

@@ -6,7 +6,6 @@ import (
"runtime"
"testing"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/moby/moby/v2/integration/internal/container"
"github.com/moby/moby/v2/testutil"
@@ -66,7 +65,7 @@ func testMigrateSnapshotter(t *testing.T, graphdriver, snapshotter string) {
assert.Equal(t, info.Driver, graphdriver)
assert.Equal(t, info.Containers, 1)
assert.Equal(t, info.Images, allImages)
container.Remove(ctx, t, apiClient, containerID, containertypes.RemoveOptions{
container.Remove(ctx, t, apiClient, containerID, client.ContainerRemoveOptions{
Force: true,
})
@@ -85,7 +84,7 @@ func testMigrateSnapshotter(t *testing.T, graphdriver, snapshotter string) {
c.Config.Cmd = []string{"echo", "hello"}
})
assert.Equal(t, result.ExitCode, 0)
container.Remove(ctx, t, apiClient, result.ContainerID, containertypes.RemoveOptions{})
container.Remove(ctx, t, apiClient, result.ContainerID, client.ContainerRemoveOptions{})
}
func TestMigrateSaveLoad(t *testing.T) {
@@ -158,5 +157,5 @@ func TestMigrateSaveLoad(t *testing.T) {
c.Config.Cmd = []string{"echo", "hello"}
})
assert.Equal(t, result.ExitCode, 0)
container.Remove(ctx, t, apiClient, result.ContainerID, containertypes.RemoveOptions{})
container.Remove(ctx, t, apiClient, result.ContainerID, client.ContainerRemoveOptions{})
}