mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-24 06:28:42 +01:00
Code Issues Projects Releases Wiki Activity

chore: updates docker to latest client and fixes deprecations (#3062)

Browse Source
This commit is contained in:
Amir Raminfar
2024-06-28 14:17:45 -07:00
committed by GitHub
parent 89f8530620
commit 48fc3d3c74
6 changed files with 63 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/docker/client.go
View File

@@ -50,9 +50,9 @@ func (s StdType) String() string {
type DockerCLI interface {
ContainerList(context.Context, container.ListOptions) ([]types.Container, error)
ContainerLogs(context.Context, string, container.LogsOptions) (io.ReadCloser, error)
Events(context.Context, types.EventsOptions) (<-chan events.Message, <-chan error)
Events(context.Context, events.ListOptions) (<-chan events.Message, <-chan error)
ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error)
ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error)
ContainerStats(ctx context.Context, containerID string, stream bool) (container.StatsResponseReader, error)
Ping(ctx context.Context) (types.Ping, error)
ContainerStart(ctx context.Context, containerID string, options container.StartOptions) error
ContainerStop(ctx context.Context, containerID string, options container.StopOptions) error
@@ -258,7 +258,7 @@ func (d *httpClient) ContainerStats(ctx context.Context, id string, stats chan<-
defer response.Body.Close()
decoder := json.NewDecoder(response.Body)
var v *types.StatsJSON
var v *container.StatsResponse
for {
if err := decoder.Decode(&v); err != nil {
return err
@@ -325,7 +325,7 @@ func (d *httpClient) ContainerLogs(ctx context.Context, id string, since *time.T
}
func (d *httpClient) Events(ctx context.Context, messages chan<- ContainerEvent) error {
dockerMessages, err := d.cli.Events(ctx, types.EventsOptions{})
dockerMessages, err := d.cli.Events(ctx, events.ListOptions{})
for {
select {