tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set endpoint-specific DriverOpts

Browse Source 
Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray 2024-05-14 12:00:06 +01:00 committed by Guillaume Lours
parent 663866cbe5
commit 048fd136d2
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/compose/create.go
View File

@ -439,6 +439,7 @@ func createEndpointSettings(p *types.Project, service types.ServiceConfig, servi
ipv4Address string ipv4Address string
ipv6Address string ipv6Address string
macAddress string macAddress string
driverOpts types.Options
) )
if config != nil { if config != nil {
ipv4Address = config.Ipv4Address ipv4Address = config.Ipv4Address
@ -449,6 +450,7 @@ func createEndpointSettings(p *types.Project, service types.ServiceConfig, servi
LinkLocalIPs: config.LinkLocalIPs, LinkLocalIPs: config.LinkLocalIPs,
} }
macAddress = config.MacAddress macAddress = config.MacAddress
driverOpts = config.DriverOpts
} }
return &network.EndpointSettings{ return &network.EndpointSettings{
Aliases: getAliases(p, service, serviceIndex, networkKey, useNetworkAliases), Aliases: getAliases(p, service, serviceIndex, networkKey, useNetworkAliases),
@ -457,6 +459,7 @@ func createEndpointSettings(p *types.Project, service types.ServiceConfig, servi
IPv6Gateway: ipv6Address, IPv6Gateway: ipv6Address,
IPAMConfig: ipam, IPAMConfig: ipam,
MacAddress: macAddress, MacAddress: macAddress,
DriverOpts: driverOpts,
} }
} }

52
pkg/compose/create_test.go
View File

@ -25,6 +25,7 @@ import (
"gotest.tools/v3/assert/cmp" "gotest.tools/v3/assert/cmp"
"github.com/docker/compose/v2/pkg/api" "github.com/docker/compose/v2/pkg/api"
"github.com/docker/docker/api/types/network"
composetypes "github.com/compose-spec/compose-go/v2/types" composetypes "github.com/compose-spec/compose-go/v2/types"
moby "github.com/docker/docker/api/types" moby "github.com/docker/docker/api/types"
@ -275,3 +276,54 @@ func TestDefaultNetworkSettings(t *testing.T) {
assert.Check(t, cmp.Nil(networkConfig)) assert.Check(t, cmp.Nil(networkConfig))
}) })
} }
func TestCreateEndpointSettings(t *testing.T) {
eps := createEndpointSettings(
&composetypes.Project{
Name: "projName",
},
composetypes.ServiceConfig{
Name: "serviceName",
ContainerName: "containerName",
Networks: map[string]*composetypes.ServiceNetworkConfig{
"netName": {
Priority: 100,
Aliases: []string{"alias1", "alias2"},
Ipv4Address: "10.16.17.18",
Ipv6Address: "fdb4:7a7f:373a:3f0c::42",
LinkLocalIPs: []string{"169.254.10.20"},
MacAddress: "10:00:00:00:01",
DriverOpts: composetypes.Options{
"driverOpt1": "optval1",
"driverOpt2": "optval2",
},
},
},
},
0, // serviceIndex
"netName", // networkKey
[]string{"link1", "link2"}, // links
true, // useNetworkAliases
)
assert.Check(t, cmp.DeepEqual(eps, &network.EndpointSettings{
IPAMConfig: &network.EndpointIPAMConfig{
IPv4Address: "10.16.17.18",
IPv6Address: "fdb4:7a7f:373a:3f0c::42",
LinkLocalIPs: []string{"169.254.10.20"},
},
Links: []string{"link1", "link2"},
Aliases: []string{"containerName", "serviceName", "alias1", "alias2"},
MacAddress: "10:00:00:00:01",
DriverOpts: map[string]string{
"driverOpt1": "optval1",
"driverOpt2": "optval2",
},
// FIXME(robmry) - IPAddress and IPv6Gateway are "operational data" fields...
// - The IPv6 address here is the container's address, not the gateway.
// - Both fields will be cleared by the daemon, but they could be removed from
// the request.
IPAddress: "10.16.17.18",
IPv6Gateway: "fdb4:7a7f:373a:3f0c::42",
}))
}