Skip to content

Commit deeda9e

Browse files
lizardrusslizardruss
authored
Merge pull request #2876 from devspace-sh/dependabot/go_modules/github.com/docker/docker-26.1.4incompatible
chore(deps): bump github.com/docker/docker from 24.0.0+incompatible to 26.1.4+incompatible
2 parents 53a504e + f065ed5 commit deeda9e

252 files changed

Lines changed: 14087 additions & 2388 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎e2e/tests/build/build.go‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import (
55
"context"
66
"errors"
77
"fmt"
8-
"github.com/onsi/ginkgo/v2"
98
"io"
109
"os"
1110
"os/exec"
1211
"strings"
1312

14-
"github.com/docker/docker/api/types"
13+
"github.com/docker/docker/api/types/image"
14+
"github.com/onsi/ginkgo/v2"
15+
1516
"github.com/docker/docker/api/types/container"
1617

1718
"github.com/loft-sh/devspace/cmd"
@@ -63,7 +64,7 @@ var _ = DevSpaceDescribe("build", func() {
6364
framework.ExpectNoError(err)
6465

6566
dockerClient := devspaceDockerClient.DockerAPIClient()
66-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
67+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
6768
framework.ExpectNoError(err)
6869

6970
found := false
@@ -102,7 +103,7 @@ var _ = DevSpaceDescribe("build", func() {
102103
framework.ExpectNoError(err)
103104

104105
dockerClient := devspaceDockerClient.DockerAPIClient()
105-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
106+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
106107
framework.ExpectNoError(err)
107108

108109
found := false
@@ -139,7 +140,7 @@ var _ = DevSpaceDescribe("build", func() {
139140
framework.ExpectNoError(err)
140141

141142
dockerClient := devspaceDockerClient.DockerAPIClient()
142-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
143+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
143144
framework.ExpectNoError(err)
144145

145146
found := false
@@ -186,7 +187,7 @@ var _ = DevSpaceDescribe("build", func() {
186187
framework.ExpectNoError(err)
187188

188189
dockerClient := devspaceDockerClient.DockerAPIClient()
189-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
190+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
190191
framework.ExpectNoError(err)
191192

192193
found := false
@@ -242,7 +243,7 @@ var _ = DevSpaceDescribe("build", func() {
242243
framework.ExpectNoError(err)
243244

244245
dockerClient := devspaceDockerClient.DockerAPIClient()
245-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
246+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
246247
framework.ExpectNoError(err)
247248

248249
for _, image := range imageList {
@@ -286,7 +287,7 @@ var _ = DevSpaceDescribe("build", func() {
286287
framework.ExpectNoError(err)
287288

288289
dockerClient := devspaceDockerClient.DockerAPIClient()
289-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
290+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
290291
framework.ExpectNoError(err)
291292

292293
for _, image := range imageList {
@@ -338,7 +339,7 @@ var _ = DevSpaceDescribe("build", func() {
338339
framework.ExpectNoError(err)
339340

340341
dockerClient := devspaceDockerClient.DockerAPIClient()
341-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
342+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
342343
framework.ExpectNoError(err)
343344

344345
for _, image := range imageList {
@@ -373,7 +374,7 @@ var _ = DevSpaceDescribe("build", func() {
373374
framework.ExpectNoError(err)
374375

375376
dockerClient := devspaceDockerClient.DockerAPIClient()
376-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
377+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
377378
framework.ExpectNoError(err)
378379
imageName := "my-docker-username/helloworld-dockerignore:latest"
379380
for _, image := range imageList {
@@ -393,7 +394,7 @@ var _ = DevSpaceDescribe("build", func() {
393394
}, nil, nil, nil, "")
394395
framework.ExpectNoError(err)
395396

396-
err = dockerClient.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
397+
err = dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
397398
framework.ExpectNoError(err)
398399

399400
statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
@@ -403,7 +404,7 @@ var _ = DevSpaceDescribe("build", func() {
403404
case <-statusCh:
404405
}
405406

406-
out, err := dockerClient.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
407+
out, err := dockerClient.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
407408
framework.ExpectNoError(err)
408409

409410
stdout := &bytes.Buffer{}
@@ -438,7 +439,7 @@ var _ = DevSpaceDescribe("build", func() {
438439
framework.ExpectNoError(err)
439440

440441
dockerClient := devspaceDockerClient.DockerAPIClient()
441-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
442+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
442443
framework.ExpectNoError(err)
443444
imageName := "my-docker-username/helloworld-dockerignore-rel-path:latest"
444445
for _, image := range imageList {
@@ -458,7 +459,7 @@ var _ = DevSpaceDescribe("build", func() {
458459
}, nil, nil, nil, "")
459460
framework.ExpectNoError(err)
460461

461-
err = dockerClient.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
462+
err = dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
462463
framework.ExpectNoError(err)
463464

464465
statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
@@ -468,7 +469,7 @@ var _ = DevSpaceDescribe("build", func() {
468469
case <-statusCh:
469470
}
470471

471-
out, err := dockerClient.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
472+
out, err := dockerClient.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
472473
framework.ExpectNoError(err)
473474

474475
stdout := &bytes.Buffer{}
@@ -503,7 +504,7 @@ var _ = DevSpaceDescribe("build", func() {
503504
framework.ExpectNoError(err)
504505

505506
dockerClient := devspaceDockerClient.DockerAPIClient()
506-
imageList, err := dockerClient.ImageList(ctx, types.ImageListOptions{})
507+
imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
507508
framework.ExpectNoError(err)
508509
imageName := "my-docker-username/helloworld-dockerignore-context:latest"
509510
for _, image := range imageList {
@@ -523,7 +524,7 @@ var _ = DevSpaceDescribe("build", func() {
523524
}, nil, nil, nil, "")
524525
framework.ExpectNoError(err)
525526

526-
err = dockerClient.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
527+
err = dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
527528
framework.ExpectNoError(err)
528529

529530
statusCh, errCh := dockerClient.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
@@ -533,7 +534,7 @@ var _ = DevSpaceDescribe("build", func() {
533534
case <-statusCh:
534535
}
535536

536-
out, err := dockerClient.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true})
537+
out, err := dockerClient.ContainerLogs(ctx, resp.ID, container.LogsOptions{ShowStdout: true})
537538
framework.ExpectNoError(err)
538539

539540
stdout := &bytes.Buffer{}

‎go.mod‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/creack/pty v1.1.18
1414
github.com/docker/cli v24.0.0+incompatible
1515
github.com/docker/distribution v2.8.2+incompatible
16-
github.com/docker/docker v24.0.0+incompatible
16+
github.com/docker/docker v26.1.4+incompatible
1717
github.com/docker/go-connections v0.4.0
1818
github.com/evanphx/json-patch v4.12.0+incompatible
1919
github.com/evanphx/json-patch/v5 v5.1.0
@@ -46,7 +46,7 @@ require (
4646
github.com/pkg/errors v0.9.1
4747
github.com/pkg/sftp v1.13.1
4848
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94
49-
github.com/sirupsen/logrus v1.9.1
49+
github.com/sirupsen/logrus v1.9.3
5050
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
5151
github.com/spf13/cobra v1.7.0
5252
github.com/spf13/pflag v1.0.5
@@ -82,18 +82,21 @@ require (
8282
github.com/containerd/console v1.0.3 // indirect
8383
github.com/containerd/containerd v1.6.18 // indirect
8484
github.com/containerd/continuity v0.3.0 // indirect
85+
github.com/containerd/log v0.1.0 // indirect
8586
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
8687
github.com/containerd/typeurl v1.0.2 // indirect
8788
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
8889
github.com/davecgh/go-spew v1.1.1 // indirect
8990
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e // indirect
91+
github.com/distribution/reference v0.5.0 // indirect
9092
github.com/docker/docker-credential-helpers v0.7.0 // indirect
9193
github.com/docker/go-metrics v0.0.1 // indirect
9294
github.com/docker/go-units v0.5.0 // indirect
9395
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
9496
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9597
github.com/emirpasic/gods v1.12.0 // indirect
9698
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
99+
github.com/felixge/httpsnoop v1.0.3 // indirect
97100
github.com/go-errors/errors v1.4.2 // indirect
98101
github.com/go-logr/logr v1.3.0 // indirect
99102
github.com/go-logr/stdr v1.2.2 // indirect
@@ -136,10 +139,12 @@ require (
136139
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
137140
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
138141
github.com/mitchellh/mapstructure v1.4.3 // indirect
142+
github.com/moby/docker-image-spec v1.3.1 // indirect
139143
github.com/moby/spdystream v0.2.0 // indirect
140144
github.com/moby/sys/sequential v0.5.0 // indirect
141145
github.com/moby/sys/signal v0.7.0 // indirect
142146
github.com/moby/sys/symlink v0.2.0 // indirect
147+
github.com/moby/sys/user v0.2.0 // indirect
143148
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
144149
github.com/modern-go/reflect2 v1.0.2 // indirect
145150
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -170,6 +175,7 @@ require (
170175
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
171176
github.com/xlab/treeprint v1.2.0 // indirect
172177
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
178+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
173179
go.opentelemetry.io/otel v1.19.0 // indirect
174180
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
175181
go.opentelemetry.io/otel/metric v1.19.0 // indirect

‎go.sum‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR
5252
github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
5353
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
5454
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
55+
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
56+
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
5557
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
5658
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
5759
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -84,6 +86,8 @@ github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvA
8486
github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
8587
github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU=
8688
github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
89+
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
90+
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
8791
github.com/containerd/nydus-snapshotter v0.3.1 h1:b8WahTrPkt3XsabjG2o/leN4fw3HWZYr+qxo/Z8Mfzk=
8892
github.com/containerd/nydus-snapshotter v0.3.1/go.mod h1:+8R7NX7vrjlxAgtidnsstwIhpzyTlriYPssTxH++uiM=
8993
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
108112
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
109113
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e h1:n81KvOMrLZa+VWHwST7dun9f0G98X3zREHS1ztYzZKU=
110114
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e/go.mod h1:xpWTC2KnJMiDLkoawhsPQcXjvwATEBcbq0xevG2YR9M=
115+
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
116+
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
111117
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
112118
github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qeXMx3O0wqM=
113119
github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
114120
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
115121
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
116-
github.com/docker/docker v24.0.0+incompatible h1:z4bf8HvONXX9Tde5lGBMQ7yCJgNahmJumdrStZAbeY4=
117-
github.com/docker/docker v24.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
122+
github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
123+
github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
118124
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
119125
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
120126
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
151157
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
152158
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
153159
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
160+
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
161+
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
154162
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
155163
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
156164
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
363371
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
364372
github.com/moby/buildkit v0.11.4 h1:mleVHr+n7HUD65QNUkgkT3d8muTzhYUoHE9FM3Ej05s=
365373
github.com/moby/buildkit v0.11.4/go.mod h1:P5Qi041LvCfhkfYBHry+Rwoo3Wi6H971J2ggE+PcIoo=
374+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
375+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
366376
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
367377
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
368378
github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
@@ -378,6 +388,8 @@ github.com/moby/sys/signal v0.7.0 h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI
378388
github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
379389
github.com/moby/sys/symlink v0.2.0 h1:tk1rOM+Ljp0nFmfOIBtlV3rTDlWOwFRhjEeAhZB0nZc=
380390
github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
391+
github.com/moby/sys/user v0.2.0 h1:OnpapJsRp25vkhw8TFG6OLJODNh/3rEwRWtJ3kakwRM=
392+
github.com/moby/sys/user v0.2.0/go.mod h1:RYstrcWOJpVh+6qzUqp2bU3eaRpdiQeKGlKitaH0PM8=
381393
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
382394
github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
383395
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
486498
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
487499
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
488500
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
489-
github.com/sirupsen/logrus v1.9.1 h1:Ou41VVR3nMWWmTiEUnj0OlsgOSCUFgsPAOl6jRIcVtQ=
490-
github.com/sirupsen/logrus v1.9.1/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
501+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
502+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
491503
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI=
492504
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
493505
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=
559571
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
560572
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c=
561573
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0/go.mod h1:LsankqVDx4W+RhZNA5uWarULII/MBhF5qwCYxTuyXjs=
574+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI=
575+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48=
562576
go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk=
563577
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
564578
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
579+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 h1:imIM3vRDMyZK1ypQlQlO+brE22I9lRhJsBDXpDWjlz8=
580+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
565581
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
566582
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
583+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 h1:8qOago/OqoFclMUUj/184tZyRdDZFpcejSjbk5Jrl6Y=
584+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1/go.mod h1:VwYo0Hak6Efuy0TXsZs8o1hnV3dHDPNtDbycG0hI8+M=
567585
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
568586
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
569587
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/docker/cli/cli/streams"
1010
"github.com/docker/distribution/reference"
11+
"github.com/docker/docker/api/types/image"
1112
dockerregistry "github.com/docker/docker/api/types/registry"
1213
"github.com/loft-sh/devspace/pkg/devspace/build/builder/helper"
1314
"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -17,7 +18,6 @@ import (
1718
"github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
1819
command2 "github.com/loft-sh/utils/pkg/command"
1920

20-
"github.com/docker/docker/api/types"
2121
"github.com/pkg/errors"
2222

2323
"github.com/docker/docker/pkg/jsonmessage"
@@ -207,7 +207,7 @@ func (b *Builder) pushImage(ctx context.Context, writer io.Writer, imageName str
207207
return err
208208
}
209209

210-
out, err := b.client.ImagePush(ctx, reference.FamiliarString(ref), types.ImagePushOptions{
210+
out, err := b.client.ImagePush(ctx, reference.FamiliarString(ref), image.PushOptions{
211211
RegistryAuth: encodedAuth,
212212
})
213213
if err != nil {

0 commit comments

Comments
 (0)