Docker tests and benchmarks: Remove use of exposed ports.

All these tests and benchmarks rely on networking between containers,
not on these ports being exposed on the host, so there is no need to
expose them on the host.

This avoids random errors like "Error starting userland proxy:
listen tcp4 0.0.0.0:12345: bind: address already in use".

#codehealth

PiperOrigin-RevId: 778272096

Author: EtiennePerot

pkg/test/dockerutil/container.go

@@ -77,9 +77,6 @@ type RunOpts struct {
 	// Cpus in which to allow execution. ("0", "1", "0-2").
 	CpusetCpus string
 
-	// Ports are the ports to be allocated.
-	Ports []int
-
 	// WorkDir sets the working directory.
 	WorkDir string
 
@@ -303,11 +300,6 @@ func (c *Container) create(ctx context.Context, profileImage string, conf *conta
 }
 
 func (c *Container) config(ctx context.Context, r RunOpts, args []string) (*container.Config, error) {
-	ports := nat.PortSet{}
-	for _, p := range r.Ports {
-		port := nat.Port(fmt.Sprintf("%d", p))
-		ports[port] = struct{}{}
-	}
 	env := append(r.Env, fmt.Sprintf("RUNSC_TEST_NAME=%s", c.Name))
 
 	image := testutil.ImageByName(r.Image)
@@ -338,13 +330,12 @@ func (c *Container) config(ctx context.Context, r RunOpts, args []string) (*cont
 	}
 
 	return &container.Config{
-		Image:        image,
-		Cmd:          args,
-		Entrypoint:   entrypoint,
-		ExposedPorts: ports,
-		Env:          env,
-		WorkingDir:   r.WorkDir,
-		User:         r.User,
+		Image:      image,
+		Cmd:        args,
+		Entrypoint: entrypoint,
+		Env:        env,
+		WorkingDir: r.WorkDir,
+		User:       r.User,
 	}, nil
 }
 

test/benchmarks/database/redis_test.go

@@ -80,10 +80,7 @@ func doBenchmarkRedis(b *testing.B, ops []string) {
 	defer server.CleanUp(ctx)
 
 	// The redis docker container takes no arguments to run a redis server.
-	if err := server.Spawn(ctx, dockerutil.RunOpts{
-		Image: "benchmarks/redis",
-		Ports: []int{port},
-	}); err != nil {
+	if err := server.Spawn(ctx, dockerutil.RunOpts{Image: "benchmarks/redis"}); err != nil {
 		b.Fatalf("failed to start redis server with: %v", err)
 	}
 	defer metricsviz.FromContainerLogs(ctx, b, server)

test/benchmarks/network/httpd_test.go

@@ -112,10 +112,9 @@ func benchmarkHttpdContinuous(b *testing.B, concurrency []int, sizes []string) {
 // runHttpd configures the static serving methods to run httpd.
 func runHttpd(b *testing.B, hey *tools.Hey) {
 	// httpd runs on port 80.
-	port := 80
+	const port = 80
 	httpdRunOpts := dockerutil.RunOpts{
 		Image: "benchmarks/httpd",
-		Ports: []int{port},
 		Env: []string{
 			// Standard environmental variables for httpd.
 			"APACHE_RUN_DIR=/tmp",

test/benchmarks/network/iperf_test.go

@@ -79,10 +79,7 @@ func BenchmarkIperfOneConnection(b *testing.B) {
 			port := 5001
 
 			// Start the server.
-			if err := server.Spawn(ctx, dockerutil.RunOpts{
-				Image: "benchmarks/iperf",
-				Ports: []int{port},
-			}, "iperf", "-s"); err != nil {
+			if err := server.Spawn(ctx, dockerutil.RunOpts{Image: "benchmarks/iperf"}, "iperf", "-s"); err != nil {
 				b.Fatalf("failed to start server with: %v", err)
 			}
 			if out, err := server.WaitForOutput(ctx, fmt.Sprintf("Server listening on TCP port %d", port), 10*time.Second); err != nil {
@@ -192,10 +189,7 @@ func BenchmarkIperfManyConnections(b *testing.B) {
 			port := 5001
 
 			// Start the server.
-			if err := server.Spawn(ctx, dockerutil.RunOpts{
-				Image: "benchmarks/iperf",
-				Ports: []int{port},
-			}, "iperf", "-s"); err != nil {
+			if err := server.Spawn(ctx, dockerutil.RunOpts{Image: "benchmarks/iperf"}, "iperf", "-s"); err != nil {
 				b.Fatalf("failed to start server with: %v", err)
 			}
 			if out, err := server.WaitForOutput(ctx, fmt.Sprintf("Server listening on TCP port %d", port), 10*time.Second); err != nil {

test/benchmarks/network/nginx_test.go

@@ -127,10 +127,7 @@ func benchmarkNginxContinuous(b *testing.B, concurrency []int, sizes []string) {
 func runNginx(b *testing.B, hey *tools.Hey, tmpfs bool) {
 	// nginx runs on port 80.
 	port := 80
-	nginxRunOpts := dockerutil.RunOpts{
-		Image: "benchmarks/nginx",
-		Ports: []int{port},
-	}
+	nginxRunOpts := dockerutil.RunOpts{Image: "benchmarks/nginx"}
 
 	nginxCmd := []string{"nginx", "-c", "/etc/nginx/nginx_gofer.conf"}
 	if tmpfs {

test/benchmarks/network/node_test.go

@@ -98,7 +98,6 @@ func runNode(b *testing.B, hey *tools.Hey) {
 		Image:   "benchmarks/node",
 		WorkDir: "/usr/src/app",
 		Links:   []string{redis.MakeLink("redis")},
-		Ports:   []int{port},
 	}, "node", "index.js", redisIP.String()); err != nil {
 		b.Fatalf("failed to spawn node instance: %v", err)
 	}

test/benchmarks/network/ruby_test.go

@@ -92,7 +92,6 @@ func runRuby(b *testing.B, hey *tools.Hey) {
 		Image:   "benchmarks/ruby",
 		WorkDir: "/app",
 		Links:   []string{redis.MakeLink("redis")},
-		Ports:   []int{port},
 		Env: []string{
 			fmt.Sprintf("PORT=%d", port),
 			"WEB_CONCURRENCY=20",