simple client has Docker field rather than inheriting all methods of the docker client (#15)

Author: tafseer-khan

container.go

@@ -10,15 +10,15 @@ import (
 
 // Run starts the container and waits for the container to exit before returning the container logs.
 func (c *Container) Run(ctx context.Context) (*MuxedReadCloser, error) {
-	if err := c.image.client.ContainerStart(ctx, c.id, types.ContainerStartOptions{}); err != nil {
+	if err := c.image.client.Docker.ContainerStart(ctx, c.id, types.ContainerStartOptions{}); err != nil {
 		return nil, errorContainerStart(c.id, c.image.image, err)
 	}
 
 	if err := c.Wait(ctx); err != nil {
 		return nil, err
 	}
 
-	info, err := c.image.client.ContainerInspect(ctx, c.id)
+	info, err := c.image.client.Docker.ContainerInspect(ctx, c.id)
 	if err != nil {
 		return nil, errorContainerInspect(c.id, c.image.image, err)
 	}
@@ -28,7 +28,7 @@ func (c *Container) Run(ctx context.Context) (*MuxedReadCloser, error) {
 		RetCodeErr = errorContainerExitCode(c.id, c.image.image, info.ContainerJSONBase.State.ExitCode)
 	}
 
-	muxed, err := c.image.client.ContainerLogs(ctx, c.id, types.ContainerLogsOptions{ShowStdout: true, ShowStderr: true})
+	muxed, err := c.image.client.Docker.ContainerLogs(ctx, c.id, types.ContainerLogsOptions{ShowStdout: true, ShowStderr: true})
 	if err != nil {
 		return nil, errorContainerLogs(c.id, c.image.image, err)
 	}
@@ -41,7 +41,7 @@ func (c *Container) Run(ctx context.Context) (*MuxedReadCloser, error) {
 // Wait calls the ContainerWait method for the container, and returns once a response has been received.
 // If there is an error response then wait will return the error
 func (c *Container) Wait(ctx context.Context) error {
-	statusCh, errCh := c.image.client.ContainerWait(ctx, c.id, container.WaitConditionNotRunning)
+	statusCh, errCh := c.image.client.Docker.ContainerWait(ctx, c.id, container.WaitConditionNotRunning)
 	select {
 	case err := <-errCh:
 		if err != nil {
@@ -54,7 +54,7 @@ func (c *Container) Wait(ctx context.Context) error {
 
 // Cleanup removes the container from the docker host client.
 func (c *Container) Cleanup(ctx context.Context) error {
-	if err := c.image.client.ContainerRemove(ctx, c.id, types.ContainerRemoveOptions{}); err != nil {
+	if err := c.image.client.Docker.ContainerRemove(ctx, c.id, types.ContainerRemoveOptions{}); err != nil {
 		return fmt.Errorf("removing container with id `%s` failed with: %s", c.id, err)
 	}
 	return nil

gc/new.go

@@ -37,7 +37,7 @@ func Start(ctx context.Context, options ...Option) error {
 	}
 
 	go func() {
-		defer client.Close()
+		defer client.Docker.Close()
 		for {
 			select {
 			case <-time.After(cnf.interval):

image.go

@@ -45,7 +45,7 @@ func (c *Client) Image(ctx context.Context, name string, options ...ImageOption)
 
 // checkImage checks the docker host client if the image is known.
 func (i *Image) checkImageExists(ctx context.Context) bool {
-	res, err := i.client.ImageList(ctx, types.ImageListOptions{
+	res, err := i.client.Docker.ImageList(ctx, types.ImageListOptions{
 		Filters: NewFilter("reference", i.image),
 	})
 
@@ -54,7 +54,7 @@ func (i *Image) checkImageExists(ctx context.Context) bool {
 
 // buildImage builds a DockerFile tarball as a docker image.
 func (i *Image) buildImage(ctx context.Context) error {
-	imageBuildResponse, err := i.client.ImageBuild(
+	imageBuildResponse, err := i.client.Docker.ImageBuild(
 		ctx,
 		i.buildTarball,
 		types.ImageBuildOptions{
@@ -78,7 +78,7 @@ func (i *Image) buildImage(ctx context.Context) error {
 
 // Pull retrieves latest changes to the image from docker hub.
 func (i *Image) Pull(ctx context.Context) (*Image, error) {
-	reader, err := i.client.ImagePull(ctx, i.image, types.ImagePullOptions{})
+	reader, err := i.client.Docker.ImagePull(ctx, i.image, types.ImagePullOptions{})
 	if err != nil {
 		return i, errorClientPull(err)
 	}
@@ -137,7 +137,7 @@ func (i *Image) Instantiate(ctx context.Context, options ...ContainerOption) (*C
 		config.WorkingDir = c.workDir
 	}
 
-	resp, err := c.image.client.ContainerCreate(ctx, config, &container.HostConfig{Mounts: mounts}, nil, nil, "")
+	resp, err := c.image.client.Docker.ContainerCreate(ctx, config, &container.HostConfig{Mounts: mounts}, nil, nil, "")
 	if err != nil {
 		return nil, errorContainerCreate(c.image.Name(), err)
 	}
@@ -148,13 +148,13 @@ func (i *Image) Instantiate(ctx context.Context, options ...ContainerOption) (*C
 
 // Clean removes all docker images that match the given filter, and max age.
 func (c *Client) Clean(ctx context.Context, age time.Duration, filter filters.Args) error {
-	images, _ := c.ImageList(ctx, types.ImageListOptions{Filters: filter})
+	images, _ := c.Docker.ImageList(ctx, types.ImageListOptions{Filters: filter})
 	timeNow := time.Now()
 
 	var err error
 	for _, image := range images {
 		if time.Unix(image.Created, 0).Add(age).Before(timeNow) {
-			if _, _err := c.ImageRemove(ctx, image.ID, types.ImageRemoveOptions{
+			if _, _err := c.Docker.ImageRemove(ctx, image.ID, types.ImageRemoveOptions{
 				Force:         true,
 				PruneChildren: true,
 			}); _err != nil {

new.go

@@ -9,7 +9,7 @@ import (
 // New creates a new dockerClient with default Options.
 func New() (dockerClient *Client, err error) {
 	dockerClient = new(Client)
-	dockerClient.Client, err = client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+	dockerClient.Docker, err = client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
 		return nil, fmt.Errorf("new docker client failed with: %w", err)
 	}

tests/all_test.go

@@ -125,7 +125,7 @@ func TestContainerCleanUpInterval(t *testing.T) {
 		return
 	}
 
-	images, err := cli.ImageList(ctx, types.ImageListOptions{
+	images, err := cli.Docker.ImageList(ctx, types.ImageListOptions{
 		Filters: ci.NewFilter("reference", testCustomImage),
 	})
 	if err != nil {
@@ -140,7 +140,7 @@ func TestContainerCleanUpInterval(t *testing.T) {
 
 	time.Sleep(20 * time.Second)
 
-	images, err = cli.ImageList(ctx, types.ImageListOptions{
+	images, err = cli.Docker.ImageList(ctx, types.ImageListOptions{
 		Filters: ci.NewFilter("reference", testCustomImage),
 	})
 	if err != nil {

types.go

@@ -17,7 +17,7 @@ type MuxedReadCloser struct {
 
 // Client wraps the methods of the docker Client.
 type Client struct {
-	*client.Client
+	Docker *client.Client
 }
 
 // volume defines the source and target to be volumed in the docker container.