InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

PublishAllPorts: don't crash with nil PortBindings

Browse Source 
Introduced by commit 85b260f ("PublishAllPorts: create
port mappings for exposed ports").

Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-11-29 16:01:47 +00:00
parent 2faf258d4d
commit 7517464283
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/internal/runconfig/config.go
View File

@@ -42,6 +42,9 @@ func decodeCreateRequest(src io.Reader) (container.CreateRequest, error) {
if w.HostConfig == nil { if w.HostConfig == nil {
w.HostConfig = &container.HostConfig{} w.HostConfig = &container.HostConfig{}
} }
if w.HostConfig.PortBindings == nil {
w.HostConfig.PortBindings = make(network.PortMap)
}
// Make sure NetworkMode has an acceptable value. We do this to ensure // Make sure NetworkMode has an acceptable value. We do this to ensure
// backwards compatible API behavior. // backwards compatible API behavior.
// //

7
integration/internal/container/ops.go
View File

@@ -72,6 +72,13 @@ func WithSysctls(sysctls map[string]string) func(*TestContainerConfig) {
} }
} }
// WithPublishAllPorts sets PublishAllPorts.
func WithPublishAllPorts(publishAll bool) func(*TestContainerConfig) {
return func(c *TestContainerConfig) {
c.HostConfig.PublishAllPorts = publishAll
}
}
// WithExposedPorts sets the exposed ports of the container // WithExposedPorts sets the exposed ports of the container
func WithExposedPorts(ports ...string) func(*TestContainerConfig) { func WithExposedPorts(ports ...string) func(*TestContainerConfig) {
return func(c *TestContainerConfig) { return func(c *TestContainerConfig) {

17
integration/networking/bridge_linux_test.go
View File

@@ -22,12 +22,14 @@ import (
"github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge" "github.com/moby/moby/v2/daemon/libnetwork/drivers/bridge"
"github.com/moby/moby/v2/daemon/libnetwork/iptables" "github.com/moby/moby/v2/daemon/libnetwork/iptables"
"github.com/moby/moby/v2/daemon/libnetwork/netlabel" "github.com/moby/moby/v2/daemon/libnetwork/netlabel"
"github.com/moby/moby/v2/integration/internal/build"
"github.com/moby/moby/v2/integration/internal/container" "github.com/moby/moby/v2/integration/internal/container"
"github.com/moby/moby/v2/integration/internal/network" "github.com/moby/moby/v2/integration/internal/network"
"github.com/moby/moby/v2/integration/internal/testutils/networking" "github.com/moby/moby/v2/integration/internal/testutils/networking"
n "github.com/moby/moby/v2/integration/network" n "github.com/moby/moby/v2/integration/network"
"github.com/moby/moby/v2/internal/testutil" "github.com/moby/moby/v2/internal/testutil"
"github.com/moby/moby/v2/internal/testutil/daemon" "github.com/moby/moby/v2/internal/testutil/daemon"
"github.com/moby/moby/v2/internal/testutil/fakecontext"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/icmd" "gotest.tools/v3/icmd"
@@ -2139,3 +2141,18 @@ func TestGatewayErrorOnNetDisconnect(t *testing.T) {
assert.Check(t, is.Contains(ctrInsp.NetworkSettings.Networks, "n1")) assert.Check(t, is.Contains(ctrInsp.NetworkSettings.Networks, "n1"))
assert.Check(t, is.Contains(ctrInsp.NetworkSettings.Networks, "n2")) assert.Check(t, is.Contains(ctrInsp.NetworkSettings.Networks, "n2"))
} }
// Regression test for https://github.com/moby/moby/issues/51620
func TestPublishAllWithNilPortBindings(t *testing.T) {
ctx := setupTest(t)
c := testEnv.APIClient()
imgWithExpose := container.WithImage(build.Do(ctx, t, c,
fakecontext.New(t, "", fakecontext.WithDockerfile("FROM busybox\nEXPOSE 80/tcp\n"))))
_ = container.Run(ctx, t, c,
container.WithAutoRemove,
container.WithPublishAllPorts(true),
imgWithExpose,
)
}