Merge pull request docker#100 from thaJeztah/use_interfaces

use docker API client interfaces instead of concrete type

Author: xenoscopic

cmd/cli/pkg/gpu/gpu.go

@@ -17,7 +17,7 @@ const (
 )
 
 // ProbeGPUSupport determines whether or not the Docker engine has GPU support.
-func ProbeGPUSupport(ctx context.Context, dockerClient *client.Client) (GPUSupport, error) {
+func ProbeGPUSupport(ctx context.Context, dockerClient client.SystemAPIClient) (GPUSupport, error) {
 	info, err := dockerClient.Info(ctx)
 	if err != nil {
 		return GPUSupportNone, err

cmd/cli/pkg/standalone/containers.go

@@ -30,7 +30,7 @@ var concurrentInstallMatcher = regexp.MustCompile(`is already in use by containe
 // FindControllerContainer searches for a running controller container. It
 // returns the ID of the container (if found), the container name (if any), the
 // full container summary (if found), or any error that occurred.
-func FindControllerContainer(ctx context.Context, dockerClient *client.Client) (string, string, container.Summary, error) {
+func FindControllerContainer(ctx context.Context, dockerClient client.ContainerAPIClient) (string, string, container.Summary, error) {
 	// Before listing, prune any stopped controller containers.
 	if err := PruneControllerContainers(ctx, dockerClient, true, NoopPrinter()); err != nil {
 		return "", "", container.Summary{}, fmt.Errorf("unable to prune stopped model runner containers: %w", err)
@@ -61,7 +61,7 @@ func FindControllerContainer(ctx context.Context, dockerClient *client.Client) (
 // determineBridgeGatewayIP attempts to identify the engine's host gateway IP
 // address on the bridge network. It may return an empty IP address even with a
 // nil error if no IP could be identified.
-func determineBridgeGatewayIP(ctx context.Context, dockerClient *client.Client) (string, error) {
+func determineBridgeGatewayIP(ctx context.Context, dockerClient client.NetworkAPIClient) (string, error) {
 	bridge, err := dockerClient.NetworkInspect(ctx, "bridge", network.InspectOptions{})
 	if err != nil {
 		return "", err
@@ -75,7 +75,7 @@ func determineBridgeGatewayIP(ctx context.Context, dockerClient *client.Client)
 }
 
 // waitForContainerToStart waits for a container to start.
-func waitForContainerToStart(ctx context.Context, dockerClient *client.Client, containerID string) error {
+func waitForContainerToStart(ctx context.Context, dockerClient client.ContainerAPIClient, containerID string) error {
 	// Unfortunately the Docker API's /containers/{id}/wait API (and the
 	// corresponding Client.ContainerWait method) don't allow waiting for
 	// container startup, so instead we'll take a polling approach.
@@ -201,7 +201,7 @@ func CreateControllerContainer(ctx context.Context, dockerClient *client.Client,
 
 // PruneControllerContainers stops and removes any model runner controller
 // containers.
-func PruneControllerContainers(ctx context.Context, dockerClient *client.Client, skipRunning bool, printer StatusPrinter) error {
+func PruneControllerContainers(ctx context.Context, dockerClient client.ContainerAPIClient, skipRunning bool, printer StatusPrinter) error {
 	// Identify all controller containers.
 	containers, err := dockerClient.ContainerList(ctx, container.ListOptions{
 		All: true,

cmd/cli/pkg/standalone/images.go

@@ -39,7 +39,7 @@ func controllerImageTagCUDA() string {
 }
 
 // EnsureControllerImage ensures that the controller container image is pulled.
-func EnsureControllerImage(ctx context.Context, dockerClient *client.Client, gpu gpupkg.GPUSupport, printer StatusPrinter) error {
+func EnsureControllerImage(ctx context.Context, dockerClient client.ImageAPIClient, gpu gpupkg.GPUSupport, printer StatusPrinter) error {
 	// Determine the target image.
 	var imageName string
 	switch gpu {
@@ -78,7 +78,7 @@ func EnsureControllerImage(ctx context.Context, dockerClient *client.Client, gpu
 }
 
 // PruneControllerImages removes any unused controller container images.
-func PruneControllerImages(ctx context.Context, dockerClient *client.Client, printer StatusPrinter) error {
+func PruneControllerImages(ctx context.Context, dockerClient client.ImageAPIClient, printer StatusPrinter) error {
 	// Remove the standard image, if present.
 	imageNameCPU := ControllerImage + ":" + controllerImageTagCPU()
 	if _, err := dockerClient.ImageRemove(ctx, imageNameCPU, image.RemoveOptions{}); err == nil {

cmd/cli/pkg/standalone/volumes.go

@@ -15,7 +15,7 @@ const modelStorageVolumeName = "docker-model-runner-models"
 // EnsureModelStorageVolume ensures that a model storage volume exists, creating
 // it if necessary. It returns the name of the storage volume or any error that
 // occurred.
-func EnsureModelStorageVolume(ctx context.Context, dockerClient *client.Client, printer StatusPrinter) (string, error) {
+func EnsureModelStorageVolume(ctx context.Context, dockerClient client.VolumeAPIClient, printer StatusPrinter) (string, error) {
 	// Try to identify the storage volume.
 	volumes, err := dockerClient.VolumeList(ctx, volume.ListOptions{
 		Filters: filters.NewArgs(
@@ -48,7 +48,7 @@ func EnsureModelStorageVolume(ctx context.Context, dockerClient *client.Client,
 }
 
 // PruneModelStorageVolumes removes any unused model storage volume(s).
-func PruneModelStorageVolumes(ctx context.Context, dockerClient *client.Client, printer StatusPrinter) error {
+func PruneModelStorageVolumes(ctx context.Context, dockerClient client.VolumeAPIClient, printer StatusPrinter) error {
 	pruned, err := dockerClient.VolumesPrune(ctx, filters.NewArgs(
 		filters.Arg("all", "true"),
 		filters.Arg("label", labelRole+"="+roleModelStorage),