starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-21 07:51:28 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

Revert "refactor(docker): migrate from github.com/docker/docker to github.com/moby/moby"

Browse Source 
This reverts commit c156173757.
This commit is contained in:
yusing
2025-11-19 15:11:54 +08:00
parent 71177b0b05
commit 98eab1fb4f
26 changed files with 178 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/api/v1/docker/containers.go
View File

@@ -4,9 +4,8 @@ import (
"context"
"sort"
"github.com/docker/docker/api/types/container"
"github.com/gin-gonic/gin"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
gperr "github.com/yusing/goutils/errs"
_ "github.com/yusing/goutils/apitypes"
@@ -40,12 +39,12 @@ func GetContainers(ctx context.Context, dockerClients DockerClients) ([]Containe
errs := gperr.NewBuilder("failed to get containers")
containers := make([]Container, 0)
for server, dockerClient := range dockerClients {
conts, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})
conts, err := dockerClient.ContainerList(ctx, container.ListOptions{All: true})
if err != nil {
errs.Add(err)
continue
}
for _, cont := range conts.Items {
for _, cont := range conts {
containers = append(containers, Container{
Server: server,
Name: cont.Names[0],