diff --git a/cmd/nerdctl/container_run_network_linux_test.go b/cmd/nerdctl/container_run_network_linux_test.go index 693f3d1db58..9f0046ad143 100644 --- a/cmd/nerdctl/container_run_network_linux_test.go +++ b/cmd/nerdctl/container_run_network_linux_test.go @@ -42,6 +42,7 @@ func TestRunInternetConnectivity(t *testing.T) { type testCase struct { args []string } + customNetID := base.InspectNetwork(customNet).ID testCases := []testCase{ { args: []string{"--net", "bridge"}, @@ -49,6 +50,12 @@ func TestRunInternetConnectivity(t *testing.T) { { args: []string{"--net", customNet}, }, + { + args: []string{"--net", customNetID}, + }, + { + args: []string{"--net", customNetID[:12]}, + }, { args: []string{"--net", "host"}, }, diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index 0279c6e0bbe..962bcc665bf 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -165,6 +165,14 @@ func (e *CNIEnv) NetworkMap() (map[string]*NetworkConfig, error) { //nolint:revi log.L.Warnf("duplicate network name %q, %#v will get superseded by %#v", n.Name, original, n) } m[n.Name] = n + if n.NerdctlID != nil { + id := *n.NerdctlID + m[id] = n + if len(id) > 12 { + id = id[:12] + m[id] = n + } + } } return m, nil }