Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 2bbb399

Browse files
authored
Merge pull request #92 from docker/moby-bump
Bump Moby-related projects to v28.2.2.
2 parents c6c14c8 + 0f2fa37 commit 2bbb399

File tree

553 files changed

+2129
-80994
lines changed

Some content is hidden

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

553 files changed

+2129
-80994
lines changed

go.mod

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/docker/model-cli
33
go 1.23.7
44

55
require (
6-
github.com/docker/cli v28.0.1+incompatible
6+
github.com/docker/cli v28.2.2+incompatible
77
github.com/docker/cli-docs-tool v0.10.0
8-
github.com/docker/docker v28.0.1+incompatible
8+
github.com/docker/docker v28.2.2+incompatible
99
github.com/docker/go-connections v0.5.0
1010
github.com/docker/go-units v0.5.0
1111
github.com/docker/model-distribution v0.0.0-20250512190053-b3792c042d57
@@ -25,16 +25,12 @@ require (
2525
require (
2626
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
2727
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
28-
github.com/BurntSushi/toml v1.4.0 // indirect
2928
github.com/Microsoft/go-winio v0.6.2 // indirect
30-
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
3129
github.com/StackExchange/wmi v1.2.1 // indirect
32-
github.com/beorn7/perks v1.0.1 // indirect
33-
github.com/bugsnag/panicwrap v1.3.4 // indirect
3430
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
35-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3631
github.com/containerd/containerd/v2 v2.0.4 // indirect
3732
github.com/containerd/errdefs v1.0.0 // indirect
33+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3834
github.com/containerd/log v0.1.0 // indirect
3935
github.com/containerd/platforms v1.0.0-rc.1 // indirect
4036
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
@@ -44,15 +40,12 @@ require (
4440
github.com/distribution/reference v0.6.0 // indirect
4541
github.com/docker/distribution v2.8.3+incompatible // indirect
4642
github.com/docker/docker-credential-helpers v0.9.3 // indirect
47-
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
48-
github.com/docker/go-metrics v0.0.1 // indirect
4943
github.com/felixge/httpsnoop v1.0.4 // indirect
5044
github.com/fsnotify/fsnotify v1.7.0 // indirect
5145
github.com/fvbommel/sortorder v1.1.0 // indirect
5246
github.com/go-logr/logr v1.4.2 // indirect
5347
github.com/go-logr/stdr v1.2.2 // indirect
5448
github.com/go-ole/go-ole v1.2.6 // indirect
55-
github.com/go-sql-driver/mysql v1.6.0 // indirect
5649
github.com/gogo/protobuf v1.3.2 // indirect
5750
github.com/google/uuid v1.6.0 // indirect
5851
github.com/gorilla/mux v1.8.1 // indirect
@@ -62,30 +55,23 @@ require (
6255
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6356
github.com/jaypipes/ghw v0.16.0 // indirect
6457
github.com/jaypipes/pcidb v1.0.1 // indirect
65-
github.com/jinzhu/gorm v1.9.16 // indirect
6658
github.com/json-iterator/go v1.1.12 // indirect
67-
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
6859
github.com/klauspost/compress v1.18.0 // indirect
6960
github.com/mattn/go-runewidth v0.0.16 // indirect
7061
github.com/mattn/go-shellwords v1.0.12 // indirect
71-
github.com/miekg/pkcs11 v1.1.1 // indirect
7262
github.com/mitchellh/go-homedir v1.1.0 // indirect
73-
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
7463
github.com/moby/docker-image-spec v1.3.1 // indirect
7564
github.com/moby/locker v1.0.1 // indirect
65+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
7666
github.com/moby/sys/sequential v0.6.0 // indirect
7767
github.com/moby/term v0.5.2 // indirect
7868
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7969
github.com/modern-go/reflect2 v1.0.2 // indirect
8070
github.com/morikuni/aec v1.0.0 // indirect
81-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8271
github.com/opencontainers/go-digest v1.0.0 // indirect
8372
github.com/opencontainers/image-spec v1.1.1 // indirect
8473
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
85-
github.com/prometheus/client_golang v1.20.5 // indirect
86-
github.com/prometheus/client_model v0.6.1 // indirect
8774
github.com/prometheus/common v0.60.0 // indirect
88-
github.com/prometheus/procfs v0.15.1 // indirect
8975
github.com/rivo/uniseg v0.4.7 // indirect
9076
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
9177
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -108,7 +94,6 @@ require (
10894
golang.org/x/mod v0.22.0 // indirect
10995
golang.org/x/net v0.36.0 // indirect
11096
golang.org/x/sys v0.31.0 // indirect
111-
golang.org/x/term v0.29.0 // indirect
11297
golang.org/x/text v0.22.0 // indirect
11398
golang.org/x/time v0.9.0 // indirect
11499
golang.org/x/tools v0.29.0 // indirect

go.sum

Lines changed: 6 additions & 90 deletions
Large diffs are not rendered by default.

pkg/standalone/containers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func waitForContainerToStart(ctx context.Context, dockerClient *client.Client, c
8282
for i := 5; i > 0; i-- {
8383
if status, err := dockerClient.ContainerInspect(ctx, containerID); err != nil {
8484
return fmt.Errorf("unable to inspect container (%s): %w", containerID[:12], err)
85-
} else if status.State.Status == "running" {
85+
} else if status.State.Status == container.StateRunning {
8686
return nil
8787
}
8888
if i > 1 {

vendor/github.com/beorn7/perks/LICENSE

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)