toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vendor: github.com/moby/moby/api, github.com/moby/moby/client master

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-08-27 16:35:41 +02:00
parent f40caed86c
commit cdf705ce66
20 changed files with 96 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/compose/convert/compose.go
View File

@ -7,6 +7,7 @@ import (
composetypes "github.com/docker/cli/cli/compose/types"
"github.com/moby/moby/api/types/network"
"github.com/moby/moby/api/types/swarm"
"github.com/moby/moby/client"
)
const (
@ -51,13 +52,13 @@ func AddStackLabel(namespace Namespace, labels map[string]string) map[string]str
type networkMap map[string]composetypes.NetworkConfig
// Networks from the compose-file type to the engine API type
func Networks(namespace Namespace, networks networkMap, servicesNetworks map[string]struct{}) (map[string]network.CreateOptions, []string) {
func Networks(namespace Namespace, networks networkMap, servicesNetworks map[string]struct{}) (map[string]client.NetworkCreateOptions, []string) {
if networks == nil {
networks = make(map[string]composetypes.NetworkConfig)
}
externalNetworks := []string{}
result := make(map[string]network.CreateOptions)
result := make(map[string]client.NetworkCreateOptions)
for internalName := range servicesNetworks {
nw := networks[internalName]
if nw.External.External {
@ -65,7 +66,7 @@ func Networks(namespace Namespace, networks networkMap, servicesNetworks map[str
continue
}
createOpts := network.CreateOptions{
createOpts := client.NetworkCreateOptions{
Labels: AddStackLabel(namespace, nw.Labels),
Driver: nw.Driver,
Options: nw.DriverOpts,

3
cli/compose/convert/compose_test.go
View File

@ -5,6 +5,7 @@ import (
composetypes "github.com/docker/cli/cli/compose/types"
"github.com/moby/moby/api/types/network"
"github.com/moby/moby/client"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/fs"
@ -76,7 +77,7 @@ func TestNetworks(t *testing.T) {
Name: "othername",
},
}
expected := map[string]network.CreateOptions{
expected := map[string]client.NetworkCreateOptions{
"foo_default": {
Labels: map[string]string{
LabelNamespace: "foo",