refactor: Update Docker API types and method signatures

- Replace deprecated `types.EventsOptions` with `events.ListOptions` in container event listening
- Update `ImageLoad` method to use `client.ImageLoadWithQuiet` option for image loading
- Improve type consistency with Docker client API imports

commit: de0c4ec493b2c6716071d45236a69b0da7be245d
author: bamen · 19mo ago · 2025-03-10 13:46 UTC
parent: c525bd7
signature: unsigned

2 files · +4 -2

M pkg/docker/containers.go +2 -1


@@ -11,6 +11,7 @@ import (
11	11		"github.com/charmbracelet/log"
12	12		"github.com/docker/docker/api/types"
13	13		"github.com/docker/docker/api/types/container"
	14	+	"github.com/docker/docker/api/types/events"
14	15		"github.com/docker/docker/api/types/filters"
15	16		"github.com/docker/docker/api/types/network"
16	17		"github.com/docker/docker/client"

@@ -768,7 +769,7 @@ func ListenForContainerEvents(networkFilter string, callback func(string, string
768	769		filters := makeEventFilters(networkFilter)
769	770
770	771		// Start listening for events
771		-	messages, errs := dockerCli.Events(ctx, types.EventsOptions{
	772	+	messages, errs := dockerCli.Events(ctx, events.ListOptions{
772	773		Filters: filters,
773	774		})
774	775

 	"github.com/charmbracelet/log"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/client"
 			filters := makeEventFilters(networkFilter)
 			// Start listening for events
-			messages, errs := dockerCli.Events(ctx, types.EventsOptions{
+			messages, errs := dockerCli.Events(ctx, events.ListOptions{
 				Filters: filters,
 			})

M pkg/docker/images.go +2 -1


@@ -14,6 +14,7 @@ import (
14	14		"github.com/charmbracelet/log"
15	15		"github.com/docker/docker/api/types"
16	16		"github.com/docker/docker/api/types/image"
	17	+	"github.com/docker/docker/client"
17	18		)
18	19
19	20		func ListContainerImages() ([]image.Summary, error) {

@@ -153,7 +154,7 @@ func ImportImageToEngine(imageFilePath string) (string, error) {
153	154		return "", fmt.Errorf("failed to reset file pointer: %w", err)
154	155		}
155	156
156		-	resp, err := dockerCli.ImageLoad(context.Background(), imageFile, true)
	157	+	resp, err := dockerCli.ImageLoad(context.Background(), imageFile, client.ImageLoadWithQuiet(true))
157	158		if err != nil {
158	159		return "", fmt.Errorf("failed to load image: %w", err)
159	160		}

 	"github.com/charmbracelet/log"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/client"
 )
 func ListContainerImages() ([]image.Summary, error) {
 		return "", fmt.Errorf("failed to reset file pointer: %w", err)
 	}
-	resp, err := dockerCli.ImageLoad(context.Background(), imageFile, true)
+	resp, err := dockerCli.ImageLoad(context.Background(), imageFile, client.ImageLoadWithQuiet(true))
 	if err != nil {
 		return "", fmt.Errorf("failed to load image: %w", err)
 	}