Added options to modify host config (#149)

* Added options to modify host config
* Updated docs comments

Signed-off-by: Federico Paolinelli <[email protected]>

Author: fedepaol

dockertest.go

@@ -181,8 +181,9 @@ type RunOptions struct {
 	Privileged   bool
 }
 
-// BuildAndRunWithOptions builds and starts a docker container
-func (d *Pool) BuildAndRunWithOptions(dockerfilePath string, opts *RunOptions) (*Resource, error) {
+// BuildAndRunWithOptions builds and starts a docker container.
+// Optional modifier functions can be passed in order to change the hostconfig values not covered in RunOptions
+func (d *Pool) BuildAndRunWithOptions(dockerfilePath string, opts *RunOptions, hcOpts ...func(*dc.HostConfig)) (*Resource, error) {
 	// Set the Dockerfile folder as build context
 	dir, file := filepath.Split(dockerfilePath)
 
@@ -199,7 +200,7 @@ func (d *Pool) BuildAndRunWithOptions(dockerfilePath string, opts *RunOptions) (
 
 	opts.Repository = opts.Name
 
-	return d.RunWithOptions(opts)
+	return d.RunWithOptions(opts, hcOpts...)
 }
 
 // BuildAndRun builds and starts a docker container
@@ -208,9 +209,13 @@ func (d *Pool) BuildAndRun(name, dockerfilePath string, env []string) (*Resource
 }
 
 // RunWithOptions starts a docker container.
+// Optional modifier functions can be passed in order to change the hostconfig values not covered in RunOptions
 //
 // pool.Run(&RunOptions{Repository: "mongo", Cmd: []string{"mongod", "--smallfiles"}})
-func (d *Pool) RunWithOptions(opts *RunOptions) (*Resource, error) {
+// pool.Run(&RunOptions{Repository: "mongo", Cmd: []string{"mongod", "--smallfiles"}}, func(hostConfig *dc.HostConfig) {
+//			hostConfig.ShmSize = shmemsize
+//		})
+func (d *Pool) RunWithOptions(opts *RunOptions, hcOpts ...func(*dc.HostConfig)) (*Resource, error) {
 	repository := opts.Repository
 	tag := opts.Tag
 	env := opts.Env
@@ -262,6 +267,22 @@ func (d *Pool) RunWithOptions(opts *RunOptions) (*Resource, error) {
 		}
 	}
 
+	hostConfig := dc.HostConfig{
+		PublishAllPorts: true,
+		Binds:           opts.Mounts,
+		Links:           opts.Links,
+		PortBindings:    opts.PortBindings,
+		ExtraHosts:      opts.ExtraHosts,
+		CapAdd:          opts.CapAdd,
+		SecurityOpt:     opts.SecurityOpt,
+		Privileged:      opts.Privileged,
+		DNS:             opts.DNS,
+	}
+
+	for _, hostConfigOption := range hcOpts {
+		hostConfigOption(&hostConfig)
+	}
+
 	c, err := d.Client.CreateContainer(dc.CreateContainerOptions{
 		Name: opts.Name,
 		Config: &dc.Config{
@@ -276,17 +297,7 @@ func (d *Pool) RunWithOptions(opts *RunOptions) (*Resource, error) {
 			Labels:       opts.Labels,
 			StopSignal:   "SIGWINCH", // to support timeouts
 		},
-		HostConfig: &dc.HostConfig{
-			PublishAllPorts: true,
-			Binds:           opts.Mounts,
-			Links:           opts.Links,
-			PortBindings:    opts.PortBindings,
-			ExtraHosts:      opts.ExtraHosts,
-			CapAdd:          opts.CapAdd,
-			SecurityOpt:     opts.SecurityOpt,
-			Privileged:      opts.Privileged,
-			DNS:             opts.DNS,
-		},
+		HostConfig:       &hostConfig,
 		NetworkingConfig: &networkingConfig,
 	})
 	if err != nil {

dockertest_test.go

@@ -166,3 +166,19 @@ func TestExpire(t *testing.T) {
 
 	require.Nil(t, pool.Purge(resource))
 }
+
+func TestContainerWithShMzSize(t *testing.T) {
+	shmemsize := int64(1024 * 1024)
+	resource, err := pool.RunWithOptions(
+		&RunOptions{
+			Name:       "db",
+			Repository: "postgres",
+			Tag:        "9.5",
+		}, func(hostConfig *dc.HostConfig) {
+			hostConfig.ShmSize = shmemsize
+		})
+	require.Nil(t, err)
+	assert.EqualValues(t, shmemsize, resource.Container.HostConfig.ShmSize, "shmsize don't match")
+
+	require.Nil(t, pool.Purge(resource))
+}