From ff4905126dcbfe52bd9371ca26e7a3c5559d5638 Mon Sep 17 00:00:00 2001 From: "IETM_FIXE\\ietm6" Date: Fri, 24 Apr 2026 07:33:48 +0200 Subject: [PATCH] Docker SDK v28 pour resoudre les conflits transitifs --- demo/orchestrator/docker.go | 4 ++-- demo/orchestrator/go.mod | 5 +---- demo/orchestrator/go.sum | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 demo/orchestrator/go.sum diff --git a/demo/orchestrator/docker.go b/demo/orchestrator/docker.go index 921f2e7..bb86bd3 100644 --- a/demo/orchestrator/docker.go +++ b/demo/orchestrator/docker.go @@ -9,9 +9,9 @@ import ( "net/http" "time" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/network" "github.com/docker/docker/client" ) @@ -125,7 +125,7 @@ type runSpec struct { func (d *DockerClient) runContainer(ctx context.Context, s runSpec) error { // Pull silencieux si image absente localement. Ignore les erreurs (l'image // peut exister localement sans etre atteignable au registre, ex: builds dev). - if reader, err := d.cli.ImagePull(ctx, s.Image, types.ImagePullOptions{}); err == nil { + if reader, err := d.cli.ImagePull(ctx, s.Image, image.PullOptions{}); err == nil { // Drain le body, sinon le pull n'est pas termine quand on continue. _, _ = io.Copy(io.Discard, reader) reader.Close() diff --git a/demo/orchestrator/go.mod b/demo/orchestrator/go.mod index 4c92601..d4b0356 100644 --- a/demo/orchestrator/go.mod +++ b/demo/orchestrator/go.mod @@ -3,9 +3,6 @@ module github.com/loremind/demo-orchestrator go 1.23 require ( - github.com/docker/docker v27.3.1+incompatible - // docker/docker v27.3.1 appelle sockets.DialPipe qui n'existe plus dans - // go-connections >= 0.6.0. Pin a 0.5.0 pour eviter le build break. - github.com/docker/go-connections v0.5.0 + github.com/docker/docker v28.0.4+incompatible github.com/google/uuid v1.6.0 ) diff --git a/demo/orchestrator/go.sum b/demo/orchestrator/go.sum deleted file mode 100644 index bdeded4..0000000 --- a/demo/orchestrator/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=