add command and volumes params

Author: pvormste

wrapper.go

@@ -18,19 +18,19 @@ type AfterInitActionFunc func(hostname string, port int) error
 type WrapperParams struct {
 	ImageName           string
 	ImageTag            string
-	EnvVariables        []string
 	ContainerPort       string
+	EnvVariables        []string
+	Volumes             []string
+	Command             []string
 	AfterInitActionFunc AfterInitActionFunc
 }
 
 // WrapperInstance holds all the information of the running container
 type WrapperInstance struct {
-	Hostname   string
-	Port       int
-	DockerHost string // deprecated
-	HostPort   int    // deprecated
-	Pool       *dockertest.Pool
-	Resource   *dockertest.Resource
+	Hostname string
+	Port     int
+	Pool     *dockertest.Pool
+	Resource *dockertest.Resource
 }
 
 // InitContainer starts a new container with the given parameters
@@ -41,7 +41,15 @@ func InitContainer(params WrapperParams) (instance *WrapperInstance, err error)
 		return nil, err
 	}
 
-	instance.Resource, err = instance.Pool.Run(params.ImageName, params.ImageTag, params.EnvVariables)
+	runOpts := dockertest.RunOptions{
+		Repository: params.ImageName,
+		Tag:        params.ImageTag,
+		Env:        params.EnvVariables,
+		Cmd:        params.Command,
+		Mounts:     params.Volumes,
+	}
+
+	instance.Resource, err = instance.Pool.RunWithOptions(&runOpts)
 	if err != nil {
 		return nil, err
 	}
@@ -76,7 +84,6 @@ func (w WrapperInstance) PurgeContainer() error {
 func (w *WrapperInstance) determineHostname() error {
 	if strings.HasPrefix(w.Pool.Client.Endpoint(), "unix://") {
 		w.Hostname = "localhost"
-		w.DockerHost = w.Hostname // will be removed in a future update
 		return nil
 	}
 
@@ -87,7 +94,6 @@ func (w *WrapperInstance) determineHostname() error {
 	}
 
 	w.Hostname = endpointUrl.Hostname()
-	w.DockerHost = w.Hostname // will be removed in a future update
 	return nil
 }
 
@@ -98,6 +104,5 @@ func (w *WrapperInstance) determinePort(containerPort string) (err error) {
 		return err
 	}
 
-	w.HostPort = w.Port // will be remove in a future update
 	return nil
 }

wrapper_test.go

@@ -24,7 +24,6 @@ var wrapperInstanceDetermineHostnameTests = []struct {
 		doAssertions: func(t *testing.T, actualInstance WrapperInstance, actualErr error) {
 			assert.NoError(t, actualErr)
 			assert.Equal(t, "localhost", actualInstance.Hostname)
-			assert.Equal(t, "localhost", actualInstance.DockerHost) // will be removed in a future update
 		},
 	},
 	{
@@ -33,7 +32,6 @@ var wrapperInstanceDetermineHostnameTests = []struct {
 		doAssertions: func(t *testing.T, actualInstance WrapperInstance, actualErr error) {
 			assert.NoError(t, actualErr)
 			assert.Equal(t, "docker", actualInstance.Hostname)
-			assert.Equal(t, "docker", actualInstance.DockerHost) // will be removed in a future update
 		},
 	},
 }
@@ -73,7 +71,6 @@ var wrapperInstanceDeterminePortTests = []struct {
 		doAssertions: func(t *testing.T, instance WrapperInstance, actualErr error) {
 			assert.Error(t, actualErr)
 			assert.Equal(t, 0, instance.Port)
-			assert.Equal(t, 0, instance.HostPort) // will be removed in a future update
 		},
 	},
 	{
@@ -83,7 +80,6 @@ var wrapperInstanceDeterminePortTests = []struct {
 		doAssertions: func(t *testing.T, instance WrapperInstance, actualErr error) {
 			assert.NoError(t, actualErr)
 			assert.Equal(t, 5432, instance.Port)
-			assert.Equal(t, 5432, instance.HostPort) // will be removed in a future update
 		},
 	},
 }