migrating to docker 26.0

Signed-off-by: Juan Bustamante <bustamantejj@gmail.com> Signed-off-by: Natalie Arellano <narellano@vmware.com>
buildpacks · Apr 22, 2024 · 0daa11f · 0daa11f
1 parent 72414e5
commit 0daa11f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/acceptance/managers/image_manager.go b/acceptance/managers/image_manager.go
@@ -90,7 +90,7 @@ func (im ImageManager) ExposePortOnImage(image, containerName string) TestContai
 	}, nil, nil, containerName)
 	im.assert.Nil(err)
 
-	err = im.dockerCli.ContainerStart(ctx, ctr.ID, dockertypes.ContainerStartOptions{})
+	err = im.dockerCli.ContainerStart(ctx, ctr.ID, container.StartOptions{})
 	im.assert.Nil(err)
 	return TestContainer{
 		testObject: im.testObject,
@@ -137,7 +137,7 @@ func (t TestContainer) RunWithOutput() string {
 func (t TestContainer) Cleanup() {
 	t.testObject.Helper()
 	t.dockerCli.ContainerKill(context.Background(), t.name, "SIGKILL")
-	t.dockerCli.ContainerRemove(context.Background(), t.name, dockertypes.ContainerRemoveOptions{Force: true})
+	t.dockerCli.ContainerRemove(context.Background(), t.name, container.RemoveOptions{Force: true})
 }
 
 func (t TestContainer) WaitForResponse(duration time.Duration) string {

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Microsoft/go-winio v0.6.1
 	github.com/apex/log v1.9.0
-	github.com/buildpacks/imgutil v0.0.0-20240416145632-bef4977c8877
+	github.com/buildpacks/imgutil v0.0.0-20240422175901-30b002586ecc
 	github.com/buildpacks/lifecycle v0.19.4-0.20240416165809-82fdf23a6dbf
 	github.com/docker/cli v26.0.1+incompatible
 	github.com/docker/docker v26.0.1+incompatible

diff --git a/go.sum b/go.sum
@@ -91,8 +91,10 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/buildpacks/imgutil v0.0.0-20240416145632-bef4977c8877 h1:dUayG/LUjbDZ/sfE0Vne779HlrVNvFCyjYg0LHjIU3U=
-github.com/buildpacks/imgutil v0.0.0-20240416145632-bef4977c8877/go.mod h1:n2R6VRuWsAX3cyHCp/u0Z4WJcixny0gYg075J39owrk=
+github.com/buildpacks/imgutil v0.0.0-20240422162419-abe3e070c1f9 h1:kN81nSNOf9pDoUSqcgFcz4KCbnXg73JdZqXx6rjimgw=
+github.com/buildpacks/imgutil v0.0.0-20240422162419-abe3e070c1f9/go.mod h1:n2R6VRuWsAX3cyHCp/u0Z4WJcixny0gYg075J39owrk=
+github.com/buildpacks/imgutil v0.0.0-20240422175901-30b002586ecc h1:Pxgpm4bIjgWY9a8r8xHlMYp6wzm5hIZHtw4Iux3XA0c=
+github.com/buildpacks/imgutil v0.0.0-20240422175901-30b002586ecc/go.mod h1:n2R6VRuWsAX3cyHCp/u0Z4WJcixny0gYg075J39owrk=
 github.com/buildpacks/lifecycle v0.19.4-0.20240416165809-82fdf23a6dbf h1:BN82j9sdRloVW0xQfbsF6+Bfz3F0NUzZ2LuM5UwX0s4=
 github.com/buildpacks/lifecycle v0.19.4-0.20240416165809-82fdf23a6dbf/go.mod h1:UbSf3hNT/QvQRBBtifDh5oMCMhIl0C8MwvoFPgjXhQE=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=