Merge pull request #21 from mbobrovskyi/master

Add ExposePorts Option

Author: dhui

dktest.go

@@ -68,13 +68,14 @@ func runImage(ctx context.Context, lgr Logger, dc client.ContainerAPIClient, img
 	opts Options) (ContainerInfo, error) {
 	c := ContainerInfo{Name: genContainerName(), ImageName: imgName}
 	createResp, err := dc.ContainerCreate(ctx, &container.Config{
-		Image:      imgName,
-		Labels:     map[string]string{label: "true"},
-		Env:        opts.env(),
-		Entrypoint: opts.Entrypoint,
-		Cmd:        opts.Cmd,
-		Volumes:    opts.volumes(),
-		Hostname:   opts.Hostname,
+		Image:        imgName,
+		Labels:       map[string]string{label: "true"},
+		Env:          opts.env(),
+		Entrypoint:   opts.Entrypoint,
+		Cmd:          opts.Cmd,
+		Volumes:      opts.volumes(),
+		Hostname:     opts.Hostname,
+		ExposedPorts: opts.ExposedPorts,
 	}, &container.HostConfig{
 		PublishAllPorts: true,
 		PortBindings:    opts.PortBindings,

dktest_test.go

@@ -94,3 +94,20 @@ func TestRunWithNetworkPortBinding(t *testing.T) {
 	dktest.Run(t, testNetworkImage, dktest.Options{ReadyFunc: nginxReady, PortRequired: true,
 		PortBindings: nat.PortMap{port: []nat.PortBinding{{HostPort: "8181"}}}}, noop)
 }
+
+func TestRunWithExposesPorts(t *testing.T) {
+	port, err := nat.NewPort("tcp", "8080")
+	if err != nil {
+		t.Fatal("Invalid port:", err)
+	}
+
+	dktest.Run(t, testNetworkImage, dktest.Options{
+		ReadyFunc:    nginxReady,
+		PortRequired: true,
+		ExposedPorts: nat.PortSet{port: struct{}{}},
+	}, func(t *testing.T, info dktest.ContainerInfo) {
+		if _, ok := info.Ports[port]; !ok {
+			t.Fatal("port not exposed")
+		}
+	})
+}

options.go

@@ -36,7 +36,8 @@ type Options struct {
 	Mounts       []mount.Mount
 	Hostname     string
 	// Platform specifies the platform of the docker image that is pulled.
-	Platform string
+	Platform     string
+	ExposedPorts nat.PortSet
 }
 
 func (o *Options) init() {