Skip to content

Commit 30ff01d

Browse files
ndeloofglours
authored andcommitted
introduce networks.interface_name
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent d25af27 commit 30ff01d

File tree

4 files changed

+29
-11
lines changed

4 files changed

+29
-11
lines changed

loader/loader_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3820,3 +3820,18 @@ services:
38203820
Image: &types.ServiceVolumeImage{SubPath: "/foo"},
38213821
})
38223822
}
3823+
3824+
func TestInterfaceName(t *testing.T) {
3825+
p, err := loadYAML(`
3826+
name: interface-name
3827+
services:
3828+
test:
3829+
networks:
3830+
test:
3831+
interface_name: eth0
3832+
`)
3833+
assert.NilError(t, err)
3834+
assert.DeepEqual(t, p.Services["test"].Networks["test"], &types.ServiceNetworkConfig{
3835+
InterfaceName: "eth0",
3836+
})
3837+
}

schema/compose-spec.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@
323323
"type": "object",
324324
"properties": {
325325
"aliases": {"$ref": "#/definitions/list_of_strings"},
326+
"interface_name": {"type": "string"},
326327
"ipv4_address": {"type": "string"},
327328
"ipv6_address": {"type": "string"},
328329
"link_local_ips": {"$ref": "#/definitions/list_of_strings"},

types/derived.gen.go

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

types/types.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,14 +470,15 @@ type PlacementPreferences struct {
470470

471471
// ServiceNetworkConfig is the network configuration for a service
472472
type ServiceNetworkConfig struct {
473-
Priority int `yaml:"priority,omitempty" json:"priority,omitempty"`
474-
GatewayPriority int `yaml:"gw_priority,omitempty" json:"gw_priority,omitempty"`
475473
Aliases []string `yaml:"aliases,omitempty" json:"aliases,omitempty"`
474+
DriverOpts Options `yaml:"driver_opts,omitempty" json:"driver_opts,omitempty"`
475+
GatewayPriority int `yaml:"gw_priority,omitempty" json:"gw_priority,omitempty"`
476+
InterfaceName string `yaml:"interface_name,omitempty" json:"interface_name,omitempty"`
476477
Ipv4Address string `yaml:"ipv4_address,omitempty" json:"ipv4_address,omitempty"`
477478
Ipv6Address string `yaml:"ipv6_address,omitempty" json:"ipv6_address,omitempty"`
478479
LinkLocalIPs []string `yaml:"link_local_ips,omitempty" json:"link_local_ips,omitempty"`
479480
MacAddress string `yaml:"mac_address,omitempty" json:"mac_address,omitempty"`
480-
DriverOpts Options `yaml:"driver_opts,omitempty" json:"driver_opts,omitempty"`
481+
Priority int `yaml:"priority,omitempty" json:"priority,omitempty"`
481482

482483
Extensions Extensions `yaml:"#extensions,inline,omitempty" json:"-"`
483484
}

0 commit comments

Comments
 (0)