mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
a715ccaaa3
When connecting a container to a new network, its NetworkSettings were unconditionally updated. But, when creating a new container, they were only updated if there were no NetworkSettings before a network was connected. But, that's always the case - so, make the update unconditionally. Signed-off-by: Rob Murray <rob.murray@docker.com>
57 lines
1.3 KiB
Go
57 lines
1.3 KiB
Go
package daemon
|
|
|
|
import (
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
networktypes "github.com/docker/docker/api/types/network"
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/libnetwork"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestDNSNamesOrder(t *testing.T) {
|
|
d := &Daemon{}
|
|
ctr := &container.Container{
|
|
ID: "35de8003b19e27f636fc6ecbf4d7072558b872a8544f287fd69ad8182ad59023",
|
|
Name: "foobar",
|
|
Config: &containertypes.Config{
|
|
Hostname: "baz",
|
|
},
|
|
HostConfig: &containertypes.HostConfig{},
|
|
}
|
|
nw := buildNetwork(t, map[string]any{
|
|
"id": "1234567890",
|
|
"name": "testnet",
|
|
"networkType": "bridge",
|
|
"enableIPv6": false,
|
|
})
|
|
epSettings := &networktypes.EndpointSettings{
|
|
Aliases: []string{"myctr"},
|
|
}
|
|
|
|
if err := d.updateNetworkConfig(ctr, nw, epSettings); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
assert.Check(t, is.DeepEqual(epSettings.DNSNames, []string{"foobar", "myctr", "35de8003b19e", "baz"}))
|
|
}
|
|
|
|
func buildNetwork(t *testing.T, config map[string]any) *libnetwork.Network {
|
|
t.Helper()
|
|
|
|
b, err := json.Marshal(config)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
nw := &libnetwork.Network{}
|
|
if err := nw.UnmarshalJSON(b); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
return nw
|
|
}
|