Skip to content

Commit 575f411

Browse files
vrothbergvrothberg
authored
Merge pull request #2064 from mtrmac/c-image-for-x-exp
Update c/image for golang.org/x/exp
2 parents ab89207 + 60ee543 commit 575f411

File tree

238 files changed

+28588
-17573
lines changed

Some content is hidden

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

238 files changed

+28588
-17573
lines changed

‎go.mod

+30-29
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/containers/skopeo
33
go 1.18
44

55
require (
6-
github.com/containers/common v0.55.2
7-
github.com/containers/image/v5 v5.26.1
6+
github.com/containers/common v0.55.0
7+
github.com/containers/image/v5 v5.26.1-0.20230802064408-aca060028898
88
github.com/containers/ocicrypt v1.1.7
9-
github.com/containers/storage v1.48.0
9+
github.com/containers/storage v1.48.1-0.20230728131509-c3da76fa3f63
1010
github.com/docker/distribution v2.8.2+incompatible
1111
github.com/opencontainers/go-digest v1.0.0
1212
github.com/opencontainers/image-spec v1.1.0-rc4
@@ -16,7 +16,7 @@ require (
1616
github.com/spf13/pflag v1.0.5
1717
github.com/stretchr/testify v1.8.4
1818
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
19-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
19+
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
2020
golang.org/x/term v0.10.0
2121
gopkg.in/yaml.v3 v3.0.1
2222
)
@@ -25,30 +25,30 @@ require (
2525
dario.cat/mergo v1.0.0 // indirect
2626
github.com/BurntSushi/toml v1.3.2 // indirect
2727
github.com/Microsoft/go-winio v0.6.1 // indirect
28-
github.com/Microsoft/hcsshim v0.10.0-rc.8 // indirect
28+
github.com/Microsoft/hcsshim v0.10.0 // indirect
2929
github.com/VividCortex/ewma v1.2.0 // indirect
3030
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
3131
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
32-
github.com/containerd/cgroups v1.1.0 // indirect
32+
github.com/containerd/cgroups/v3 v3.0.2 // indirect
3333
github.com/containerd/containerd v1.7.2 // indirect
3434
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
3535
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
3636
github.com/coreos/go-oidc/v3 v3.6.0 // indirect
37-
github.com/cyberphone/json-canonicalization v0.0.0-20230514072755-504adb8a8af1 // indirect
37+
github.com/cyberphone/json-canonicalization v0.0.0-20230710064741-aa7fe85c7dbd // indirect
3838
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
3939
github.com/davecgh/go-spew v1.1.1 // indirect
40-
github.com/docker/docker v24.0.2+incompatible // indirect
41-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
40+
github.com/docker/docker v24.0.5+incompatible // indirect
41+
github.com/docker/docker-credential-helpers v0.8.0 // indirect
4242
github.com/docker/go-connections v0.4.0 // indirect
4343
github.com/docker/go-units v0.5.0 // indirect
4444
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
4545
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
4646
github.com/go-logr/logr v1.2.4 // indirect
4747
github.com/go-logr/stdr v1.2.2 // indirect
4848
github.com/go-openapi/analysis v0.21.4 // indirect
49-
github.com/go-openapi/errors v0.20.3 // indirect
50-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
51-
github.com/go-openapi/jsonreference v0.20.0 // indirect
49+
github.com/go-openapi/errors v0.20.4 // indirect
50+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
51+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5252
github.com/go-openapi/loads v0.21.2 // indirect
5353
github.com/go-openapi/runtime v0.26.0 // indirect
5454
github.com/go-openapi/spec v0.20.9 // indirect
@@ -69,7 +69,7 @@ require (
6969
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7070
github.com/josharian/intern v1.0.0 // indirect
7171
github.com/json-iterator/go v1.1.12 // indirect
72-
github.com/klauspost/compress v1.16.6 // indirect
72+
github.com/klauspost/compress v1.16.7 // indirect
7373
github.com/klauspost/pgzip v1.2.6 // indirect
7474
github.com/letsencrypt/boulder v0.0.0-20230213213521-fdfea0d469b6 // indirect
7575
github.com/mailru/easyjson v0.7.7 // indirect
@@ -82,8 +82,8 @@ require (
8282
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8383
github.com/modern-go/reflect2 v1.0.2 // indirect
8484
github.com/oklog/ulid v1.3.1 // indirect
85-
github.com/opencontainers/runc v1.1.7 // indirect
86-
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
85+
github.com/opencontainers/runc v1.1.8 // indirect
86+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
8787
github.com/opencontainers/selinux v1.11.0 // indirect
8888
github.com/opentracing/opentracing-go v1.2.0 // indirect
8989
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
@@ -93,8 +93,8 @@ require (
9393
github.com/rivo/uniseg v0.4.4 // indirect
9494
github.com/russross/blackfriday v2.0.0+incompatible // indirect
9595
github.com/segmentio/ksuid v1.0.4 // indirect
96-
github.com/sigstore/fulcio v1.3.1 // indirect
97-
github.com/sigstore/rekor v1.2.2-0.20230601122533-4c81ff246d12 // indirect
96+
github.com/sigstore/fulcio v1.4.0 // indirect
97+
github.com/sigstore/rekor v1.2.2 // indirect
9898
github.com/sigstore/sigstore v1.7.1 // indirect
9999
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
100100
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
@@ -103,29 +103,30 @@ require (
103103
github.com/theupdateframework/go-tuf v0.5.2 // indirect
104104
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
105105
github.com/ulikunitz/xz v0.5.11 // indirect
106-
github.com/vbatts/tar-split v0.11.3 // indirect
107-
github.com/vbauerster/mpb/v8 v8.4.0 // indirect
106+
github.com/vbatts/tar-split v0.11.5 // indirect
107+
github.com/vbauerster/mpb/v8 v8.5.2 // indirect
108108
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
109109
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
110110
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
111111
go.etcd.io/bbolt v1.3.7 // indirect
112112
go.mongodb.org/mongo-driver v1.11.3 // indirect
113113
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
114114
go.opencensus.io v0.24.0 // indirect
115-
go.opentelemetry.io/otel v1.15.0 // indirect
116-
go.opentelemetry.io/otel/trace v1.15.0 // indirect
117-
golang.org/x/crypto v0.10.0 // indirect
118-
golang.org/x/mod v0.10.0 // indirect
119-
golang.org/x/net v0.11.0 // indirect
120-
golang.org/x/oauth2 v0.9.0 // indirect
115+
go.opentelemetry.io/otel v1.16.0 // indirect
116+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
118+
golang.org/x/crypto v0.11.0 // indirect
119+
golang.org/x/mod v0.11.0 // indirect
120+
golang.org/x/net v0.12.0 // indirect
121+
golang.org/x/oauth2 v0.10.0 // indirect
121122
golang.org/x/sync v0.3.0 // indirect
122123
golang.org/x/sys v0.10.0 // indirect
123-
golang.org/x/text v0.10.0 // indirect
124+
golang.org/x/text v0.11.0 // indirect
124125
golang.org/x/tools v0.9.3 // indirect
125126
google.golang.org/appengine v1.6.7 // indirect
126-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
127-
google.golang.org/grpc v1.55.0 // indirect
128-
google.golang.org/protobuf v1.30.0 // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
128+
google.golang.org/grpc v1.56.2 // indirect
129+
google.golang.org/protobuf v1.31.0 // indirect
129130
gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
130131
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
131132
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)