diff --git a/loader/merge.go b/loader/merge.go index ce7c1dcf2..51bb32937 100644 --- a/loader/merge.go +++ b/loader/merge.go @@ -330,7 +330,6 @@ func mergeUlimitsConfig(dst, src reflect.Value) error { // nolint: unparam func mergeServiceNetworkConfig(dst, src reflect.Value) error { if src.Interface() != reflect.Zero(reflect.TypeOf(src.Interface())).Interface() { - dst.Elem().FieldByName("Aliases").Set(src.Elem().FieldByName("Aliases")) if ipv4 := src.Elem().FieldByName("Ipv4Address").Interface().(string); ipv4 != "" { dst.Elem().FieldByName("Ipv4Address").SetString(ipv4) } diff --git a/loader/merge_test.go b/loader/merge_test.go index 4f173b11b..41ff32f04 100644 --- a/loader/merge_test.go +++ b/loader/merge_test.go @@ -816,7 +816,7 @@ func TestLoadMultipleServiceNetworks(t *testing.T) { }, expected: map[string]*types.ServiceNetworkConfig{ "net1": { - Aliases: []string{"alias2", "alias3"}, + Aliases: []string{"alias1", "alias2", "alias3"}, }, "net2": nil, "net3": {}, @@ -1117,7 +1117,7 @@ func TestMergeServiceNetworkConfig(t *testing.T) { }, } base := map[string]*types.ServiceNetworkConfig{ - "override-aliases": { + "merge-aliases": { Aliases: []string{"100", "101"}, Ipv4Address: "127.0.0.1", Ipv6Address: "0:0:0:0:0:0:0:1", @@ -1146,8 +1146,8 @@ func TestMergeServiceNetworkConfig(t *testing.T) { t, base, map[string]*types.ServiceNetworkConfig{ - "override-aliases": { - Aliases: []string{"110", "111"}, + "merge-aliases": { + Aliases: []string{"100", "101", "110", "111"}, Ipv4Address: "127.0.1.1", Ipv6Address: "0:0:0:0:0:0:1:1", },