starred/godoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-25 10:18:59 +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/watcher/health/monitor/docker.go
View File

@@ -5,8 +5,7 @@ import (
"net/url"
"github.com/bytedance/sonic"
"github.com/moby/moby/api/types/container"
"github.com/moby/moby/client"
"github.com/docker/docker/api/types/container"
"github.com/rs/zerolog/log"
"github.com/yusing/godoxy/internal/docker"
"github.com/yusing/godoxy/internal/types"
@@ -89,7 +88,7 @@ func (mon *DockerHealthMonitor) CheckHealth() (types.HealthCheckResult, error) {
defer cancel()
// the actual inspect response is intercepted and returned as RequestInterceptedError
_, err := mon.client.ContainerInspect(ctx, mon.containerID, client.ContainerInspectOptions{})
_, err := mon.client.ContainerInspect(ctx, mon.containerID)
var interceptedErr *httputils.RequestInterceptedError
if !httputils.AsRequestInterceptedError(err, &interceptedErr) {
@@ -112,7 +111,7 @@ func (mon *DockerHealthMonitor) CheckHealth() (types.HealthCheckResult, error) {
mon.numDockerFailures = 0
return types.HealthCheckResult{
Healthy: false,
Detail: "container is " + string(status),
Detail: "container is " + status,
}, nil
case "created":
mon.numDockerFailures = 0