Merge pull request #2876 from devspace-sh/dependabot/go_modules/githu…

…b.com/docker/docker-26.1.4incompatible

chore(deps): bump github.com/docker/docker from 24.0.0+incompatible to 26.1.4+incompatible

e2e/tests/build/build.go

@@ -5,13 +5,14 @@ import (
  "context"
  "errors"
  "fmt"
- "github.com/onsi/ginkgo/v2"
  "io"
  "os"
  "os/exec"
  "strings"
 
- "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/image"
+ "github.com/onsi/ginkgo/v2"
+
  "github.com/docker/docker/api/types/container"
 
  "github.com/loft-sh/devspace/cmd"
@@ -63,7 +64,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  found := false
@@ -102,7 +103,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  found := false
@@ -139,7 +140,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  found := false
@@ -186,7 +187,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  found := false
@@ -242,7 +243,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  for _, image := range imageList {
@@ -286,7 +287,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  for _, image := range imageList {
@@ -338,7 +339,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
 
  for _, image := range imageList {
@@ -373,7 +374,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
  imageName := "my-docker-username/helloworld-dockerignore:latest"
  for _, image := range imageList {
@@ -393,7 +394,7 @@ var _ = DevSpaceDescribe("build", func() {
  }, nil, nil, nil, "")
  framework.ExpectNoError(err)
 
- err = dockerClient.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
+ err = dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
  framework.ExpectNoError(err)
 
  statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
@@ -403,7 +404,7 @@ var _ = DevSpaceDescribe("build", func() {
  case <-statusCh:
  }
 
- out, err := dockerClient.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
+ out, err := dockerClient.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
  framework.ExpectNoError(err)
 
  stdout := &bytes.Buffer{}
@@ -438,7 +439,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
  imageName := "my-docker-username/helloworld-dockerignore-rel-path:latest"
  for _, image := range imageList {
@@ -458,7 +459,7 @@ var _ = DevSpaceDescribe("build", func() {
  }, nil, nil, nil, "")
  framework.ExpectNoError(err)
 
- err = dockerClient.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
+ err = dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
  framework.ExpectNoError(err)
 
  statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
@@ -468,7 +469,7 @@ var _ = DevSpaceDescribe("build", func() {
  case <-statusCh:
  }
 
- out, err := dockerClient.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
+ out, err := dockerClient.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
  framework.ExpectNoError(err)
 
  stdout := &bytes.Buffer{}
@@ -503,7 +504,7 @@ var _ = DevSpaceDescribe("build", func() {
  framework.ExpectNoError(err)
 
  dockerClient := devspaceDockerClient.DockerAPIClient()
- imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
+ imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
  framework.ExpectNoError(err)
  imageName := "my-docker-username/helloworld-dockerignore-context:latest"
  for _, image := range imageList {
@@ -523,7 +524,7 @@ var _ = DevSpaceDescribe("build", func() {
  }, nil, nil, nil, "")
  framework.ExpectNoError(err)
 
- err = dockerClient.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
+ err = dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
  framework.ExpectNoError(err)
 
  statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
@@ -533,7 +534,7 @@ var _ = DevSpaceDescribe("build", func() {
  case <-statusCh:
  }
 
- out, err := dockerClient.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
+ out, err := dockerClient.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
  framework.ExpectNoError(err)
 
  stdout := &bytes.Buffer{}

go.mod

@@ -13,7 +13,7 @@ require (
  github.com/creack/pty v1.1.18
  github.com/docker/cli v24.0.0+incompatible
  github.com/docker/distribution v2.8.2+incompatible
- github.com/docker/docker v24.0.0+incompatible
+ github.com/docker/docker v26.1.4+incompatible
  github.com/docker/go-connections v0.4.0
  github.com/evanphx/json-patch v4.12.0+incompatible
  github.com/evanphx/json-patch/v5 v5.1.0
@@ -46,7 +46,7 @@ require (
  github.com/pkg/errors v0.9.1
  github.com/pkg/sftp v1.13.1
  github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94
- github.com/sirupsen/logrus v1.9.1
+ github.com/sirupsen/logrus v1.9.3
  github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
  github.com/spf13/cobra v1.7.0
  github.com/spf13/pflag v1.0.5
@@ -82,18 +82,21 @@ require (
  github.com/containerd/console v1.0.3 // indirect
  github.com/containerd/containerd v1.6.18 // indirect
  github.com/containerd/continuity v0.3.0 // indirect
+ github.com/containerd/log v0.1.0 // indirect
  github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
  github.com/containerd/typeurl v1.0.2 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e // indirect
+ github.com/distribution/reference v0.5.0 // indirect
  github.com/docker/docker-credential-helpers v0.7.0 // indirect
  github.com/docker/go-metrics v0.0.1 // indirect
  github.com/docker/go-units v0.5.0 // indirect
  github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
  github.com/emicklei/go-restful/v3 v3.11.0 // indirect
  github.com/emirpasic/gods v1.12.0 // indirect
  github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+ github.com/felixge/httpsnoop v1.0.3 // indirect
  github.com/go-errors/errors v1.4.2 // indirect
  github.com/go-logr/logr v1.3.0 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
@@ -136,10 +139,12 @@ require (
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/mitchellh/mapstructure v1.4.3 // indirect
+ github.com/moby/docker-image-spec v1.3.1 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
  github.com/moby/sys/signal v0.7.0 // indirect
  github.com/moby/sys/symlink v0.2.0 // indirect
+ github.com/moby/sys/user v0.2.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -170,6 +175,7 @@ require (
  github.com/xeipuuv/gojsonschema v1.2.0 // indirect
  github.com/xlab/treeprint v1.2.0 // indirect
  go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
  go.opentelemetry.io/otel v1.19.0 // indirect
  go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
  go.opentelemetry.io/otel/metric v1.19.0 // indirect

go.sum

@@ -52,6 +52,8 @@ github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -84,6 +86,8 @@ github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvA
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
 github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU=
 github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/containerd/nydus-snapshotter v0.3.1 h1:b8WahTrPkt3XsabjG2o/leN4fw3HWZYr+qxo/Z8Mfzk=
 github.com/containerd/nydus-snapshotter v0.3.1/go.mod h1:+8R7NX7vrjlxAgtidnsstwIhpzyTlriYPssTxH++uiM=
 github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k=
@@ -108,13 +112,15 @@ github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8l
 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e h1:n81KvOMrLZa+VWHwST7dun9f0G98X3zREHS1ztYzZKU=
 github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e/go.mod h1:xpWTC2KnJMiDLkoawhsPQcXjvwATEBcbq0xevG2YR9M=
+github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
+github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qeXMx3O0wqM=
 github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v24.0.0+incompatible h1:z4bf8HvONXX9Tde5lGBMQ7yCJgNahmJumdrStZAbeY4=
-github.com/docker/docker v24.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
+github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -151,6 +157,8 @@ github.com/evanphx/json-patch/v5 v5.1.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2Vvl
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss=
@@ -363,6 +371,8 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/moby/buildkit v0.11.4 h1:mleVHr+n7HUD65QNUkgkT3d8muTzhYUoHE9FM3Ej05s=
 github.com/moby/buildkit v0.11.4/go.mod h1:P5Qi041LvCfhkfYBHry+Rwoo3Wi6H971J2ggE+PcIoo=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
@@ -378,6 +388,8 @@ github.com/moby/sys/signal v0.7.0 h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI
 github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
 github.com/moby/sys/symlink v0.2.0 h1:tk1rOM+Ljp0nFmfOIBtlV3rTDlWOwFRhjEeAhZB0nZc=
 github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
+github.com/moby/sys/user v0.2.0 h1:OnpapJsRp25vkhw8TFG6OLJODNh/3rEwRWtJ3kakwRM=
+github.com/moby/sys/user v0.2.0/go.mod h1:RYstrcWOJpVh+6qzUqp2bU3eaRpdiQeKGlKitaH0PM8=
 github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
 github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -486,8 +498,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/sirupsen/logrus v1.9.1 h1:Ou41VVR3nMWWmTiEUnj0OlsgOSCUFgsPAOl6jRIcVtQ=
-github.com/sirupsen/logrus v1.9.1/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI=
 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/spdx/tools-golang v0.3.1-0.20230104082527-d6f58551be3f h1:9B623Cfs+mclYK6dsae7gLSwuIBHvlgmEup87qpqsAQ=
@@ -559,11 +571,17 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48=
 go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk=
 go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
 go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
+go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 h1:imIM3vRDMyZK1ypQlQlO+brE22I9lRhJsBDXpDWjlz8=
+go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 h1:8qOago/OqoFclMUUj/184tZyRdDZFpcejSjbk5Jrl6Y=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1/go.mod h1:VwYo0Hak6Efuy0TXsZs8o1hnV3dHDPNtDbycG0hI8+M=
 go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
 go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
 go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=

pkg/devspace/build/builder/docker/docker.go

@@ -8,6 +8,7 @@ import (
 
  "github.com/docker/cli/cli/streams"
  "github.com/docker/distribution/reference"
+ "github.com/docker/docker/api/types/image"
  dockerregistry "github.com/docker/docker/api/types/registry"
  "github.com/loft-sh/devspace/pkg/devspace/build/builder/helper"
  "github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -17,7 +18,6 @@ import (
  "github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
  command2 "github.com/loft-sh/utils/pkg/command"
 
- "github.com/docker/docker/api/types"
  "github.com/pkg/errors"
 
  "github.com/docker/docker/pkg/jsonmessage"
@@ -207,7 +207,7 @@ func (b *Builder) pushImage(ctx context.Context, writer io.Writer, imageName str
  return err
  }
 
- out, err := b.client.ImagePush(ctx, reference.FamiliarString(ref), types.ImagePushOptions{
+ out, err := b.client.ImagePush(ctx, reference.FamiliarString(ref), image.PushOptions{
  RegistryAuth: encodedAuth,
  })
  if err != nil {