Skip to content

Commit 0a73f20

Browse files
authored
Merge pull request #2453 from containers/renovate/github.com-containers-image-v5-5.x
fix(deps): update module github.com/containers/image/v5 to v5.33.0
2 parents 78d7940 + fa1762f commit 0a73f20

File tree

548 files changed

+26513
-10831
lines changed

Some content is hidden

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

548 files changed

+26513
-10831
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ ostree-rs-ext_task:
151151
dockerfile: contrib/cirrus/ostree_ext.dockerfile
152152
docker_arguments: # required build-args
153153
BASE_FQIN: quay.io/coreos-assembler/fcos-buildroot:testing-devel
154-
CIRRUS_IMAGE_VERSION: 2
154+
CIRRUS_IMAGE_VERSION: 3
155155
env:
156156
EXT_REPO_NAME: ostree-rs-ext
157157
EXT_REPO_HOME: $CIRRUS_WORKING_DIR/../$EXT_REPO_NAME

contrib/cirrus/ostree_ext.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG CIRRUS_IMAGE_VERSION
88
ENV CIRRUS_IMAGE_VERSION=$CIRRUS_IMAGE_VERSION
99
ADD https://sh.rustup.rs /var/tmp/rustup_installer.sh
1010

11-
RUN dnf erase -y rust && \
11+
RUN dnf remove -y rust && \
1212
chmod +x /var/tmp/rustup_installer.sh && \
1313
/var/tmp/rustup_installer.sh -y --default-toolchain stable --profile minimal
1414

go.mod

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module github.com/containers/skopeo
22

33
// Minimum required golang version
4-
go 1.22.0
4+
go 1.22.6
55

66
// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
77

88
require (
99
github.com/Masterminds/semver/v3 v3.3.0
1010
github.com/containers/common v0.60.4
11-
github.com/containers/image/v5 v5.32.2
11+
github.com/containers/image/v5 v5.33.0
1212
github.com/containers/ocicrypt v1.2.0
13-
github.com/containers/storage v1.55.1
13+
github.com/containers/storage v1.56.0
1414
github.com/docker/distribution v2.8.3+incompatible
1515
github.com/moby/sys/capability v0.3.0
1616
github.com/opencontainers/go-digest v1.0.0
@@ -26,30 +26,32 @@ require (
2626
)
2727

2828
require (
29-
dario.cat/mergo v1.0.0 // indirect
29+
dario.cat/mergo v1.0.1 // indirect
3030
github.com/BurntSushi/toml v1.4.0 // indirect
3131
github.com/Microsoft/go-winio v0.6.2 // indirect
32-
github.com/Microsoft/hcsshim v0.12.5 // indirect
32+
github.com/Microsoft/hcsshim v0.12.9 // indirect
3333
github.com/VividCortex/ewma v1.2.0 // indirect
3434
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
3535
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3636
github.com/containerd/cgroups/v3 v3.0.3 // indirect
37-
github.com/containerd/errdefs v0.1.0 // indirect
37+
github.com/containerd/errdefs v0.3.0 // indirect
38+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3839
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
40+
github.com/containerd/typeurl/v2 v2.2.0 // indirect
3941
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
40-
github.com/coreos/go-oidc/v3 v3.10.0 // indirect
42+
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
4143
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
42-
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
44+
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
4345
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4446
github.com/distribution/reference v0.6.0 // indirect
45-
github.com/docker/docker v27.1.1+incompatible // indirect
47+
github.com/docker/docker v27.3.1+incompatible // indirect
4648
github.com/docker/docker-credential-helpers v0.8.2 // indirect
4749
github.com/docker/go-connections v0.5.0 // indirect
4850
github.com/docker/go-units v0.5.0 // indirect
4951
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
5052
github.com/felixge/httpsnoop v1.0.4 // indirect
5153
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
52-
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
54+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
5355
github.com/go-logr/logr v1.4.2 // indirect
5456
github.com/go-logr/stdr v1.2.2 // indirect
5557
github.com/go-openapi/analysis v0.23.0 // indirect
@@ -65,7 +67,7 @@ require (
6567
github.com/gogo/protobuf v1.3.2 // indirect
6668
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6769
github.com/golang/protobuf v1.5.4 // indirect
68-
github.com/google/go-containerregistry v0.20.0 // indirect
70+
github.com/google/go-containerregistry v0.20.2 // indirect
6971
github.com/google/go-intervals v0.0.2 // indirect
7072
github.com/google/uuid v1.6.0 // indirect
7173
github.com/gorilla/mux v1.8.1 // indirect
@@ -76,23 +78,23 @@ require (
7678
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7779
github.com/josharian/intern v1.0.0 // indirect
7880
github.com/json-iterator/go v1.1.12 // indirect
79-
github.com/klauspost/compress v1.17.9 // indirect
81+
github.com/klauspost/compress v1.17.11 // indirect
8082
github.com/klauspost/pgzip v1.2.6 // indirect
81-
github.com/letsencrypt/boulder v0.0.0-20240418210053-89b07f4543e0 // indirect
83+
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
8284
github.com/mailru/easyjson v0.7.7 // indirect
8385
github.com/mattn/go-runewidth v0.0.16 // indirect
84-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
86+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
8587
github.com/miekg/pkcs11 v1.1.1 // indirect
8688
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
8789
github.com/mitchellh/mapstructure v1.5.0 // indirect
8890
github.com/moby/docker-image-spec v1.3.1 // indirect
8991
github.com/moby/sys/mountinfo v0.7.2 // indirect
90-
github.com/moby/sys/user v0.2.0 // indirect
92+
github.com/moby/sys/user v0.3.0 // indirect
9193
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9294
github.com/modern-go/reflect2 v1.0.2 // indirect
9395
github.com/oklog/ulid v1.3.1 // indirect
9496
github.com/opencontainers/runtime-spec v1.2.0 // indirect
95-
github.com/opencontainers/selinux v1.11.0 // indirect
97+
github.com/opencontainers/selinux v1.11.1 // indirect
9698
github.com/opentracing/opentracing-go v1.2.0 // indirect
9799
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
98100
github.com/pkg/errors v0.9.1 // indirect
@@ -103,36 +105,36 @@ require (
103105
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
104106
github.com/segmentio/ksuid v1.0.4 // indirect
105107
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
106-
github.com/sigstore/fulcio v1.4.5 // indirect
108+
github.com/sigstore/fulcio v1.6.4 // indirect
107109
github.com/sigstore/rekor v1.3.6 // indirect
108-
github.com/sigstore/sigstore v1.8.4 // indirect
110+
github.com/sigstore/sigstore v1.8.9 // indirect
109111
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
110112
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
111-
github.com/sylabs/sif/v2 v2.18.0 // indirect
113+
github.com/sylabs/sif/v2 v2.19.1 // indirect
112114
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
113115
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
114116
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
115117
github.com/ulikunitz/xz v0.5.12 // indirect
116-
github.com/vbatts/tar-split v0.11.5 // indirect
117-
github.com/vbauerster/mpb/v8 v8.7.5 // indirect
118+
github.com/vbatts/tar-split v0.11.6 // indirect
119+
github.com/vbauerster/mpb/v8 v8.8.3 // indirect
118120
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
119121
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
120122
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
121123
go.mongodb.org/mongo-driver v1.14.0 // indirect
122124
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
123125
go.opencensus.io v0.24.0 // indirect
124-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
125-
go.opentelemetry.io/otel v1.24.0 // indirect
126-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
127-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
128-
golang.org/x/crypto v0.26.0 // indirect
126+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
127+
go.opentelemetry.io/otel v1.28.0 // indirect
128+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
129+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
130+
golang.org/x/crypto v0.28.0 // indirect
129131
golang.org/x/mod v0.21.0 // indirect
130132
golang.org/x/net v0.28.0 // indirect
131-
golang.org/x/oauth2 v0.22.0 // indirect
133+
golang.org/x/oauth2 v0.23.0 // indirect
132134
golang.org/x/sync v0.8.0 // indirect
133135
golang.org/x/sys v0.26.0 // indirect
134-
golang.org/x/text v0.17.0 // indirect
135-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
136-
google.golang.org/grpc v1.64.1 // indirect
137-
google.golang.org/protobuf v1.34.1 // indirect
136+
golang.org/x/text v0.19.0 // indirect
137+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
138+
google.golang.org/grpc v1.67.0 // indirect
139+
google.golang.org/protobuf v1.34.2 // indirect
138140
)

0 commit comments

Comments
 (0)