Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.38] Bump c/storage v1.56.1, c/image v5.33.1, c/common v0.61.1 #5911

Merged
merged 1 commit into from
Jan 17, 2025
Merged

[release-1.38] Bump c/storage v1.56.1, c/image v5.33.1, c/common v0.61.1 #5911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
${FEDORA_CACHE_IMAGE_NAME}
${PRIOR_FEDORA_CACHE_IMAGE_NAME}
${DEBIAN_CACHE_IMAGE_NAME}
build-push-${IMAGE_SUFFIX}
BUILDID: "${CIRRUS_BUILD_ID}"
REPOREF: "${CIRRUS_CHANGE_IN_REPO}"
GCPJSON: ENCRYPTED[d3614d6f5cc0e66be89d4252b3365fd84f14eee0259d4eb47e25fc0bc2842c7937f5ee8c882b7e547b4c5ec4b6733b14]
Expand Down Expand Up @@ -147,7 +146,7 @@
path: ./bin/*


unit_task:

Check warning on line 149 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L149 

task "Unit tests w/ vfs" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 149 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L149 

task "Unit tests w/ vfs" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 149 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L149 

task "Unit tests w/ overlay" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 149 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L149 

task "Unit tests w/ overlay" depends on task "Cross Compile", but their only_if conditions are different
name: 'Unit tests w/ $STORAGE_DRIVER'
alias: unit
only_if: &not_build_docs >-
Expand All @@ -174,7 +173,7 @@
path: ./bin/*


conformance_task:

Check warning on line 176 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L176 

task "Debian Conformance w/ vfs" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 176 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L176 

task "Debian Conformance w/ vfs" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 176 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L176 

task "Debian Conformance w/ overlay" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 176 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L176 

task "Debian Conformance w/ overlay" depends on task "Cross Compile", but their only_if conditions are different
name: 'Debian Conformance w/ $STORAGE_DRIVER'
alias: conformance
only_if: *not_build_docs
Expand All @@ -196,7 +195,7 @@
conformance_test_script: '${SCRIPT_BASE}/test.sh conformance |& ${_TIMESTAMP}'


integration_task:

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration fedora-41 w/ vfs" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration fedora-41 w/ vfs" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration debian-13 w/ vfs" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration debian-13 w/ vfs" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration fedora-41 w/ overlay" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration fedora-41 w/ overlay" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration debian-13 w/ overlay" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 198 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L198 

task "Integration debian-13 w/ overlay" depends on task "Cross Compile", but their only_if conditions are different
name: "Integration $DISTRO_NV w/ $STORAGE_DRIVER"
alias: integration
only_if: *not_build_docs
Expand Down Expand Up @@ -253,7 +252,7 @@
package_versions_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh packages'
golang_version_script: '$GOSRC/$SCRIPT_BASE/logcollector.sh golang'

integration_rootless_task:

Check warning on line 255 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L255 

task "Integration rootless fedora-41 w/ overlay" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 255 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L255 

task "Integration rootless fedora-41 w/ overlay" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 255 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L255 

task "Integration rootless debian-13 w/ overlay" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 255 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L255 

task "Integration rootless debian-13 w/ overlay" depends on task "Cross Compile", but their only_if conditions are different
name: "Integration rootless $DISTRO_NV w/ $STORAGE_DRIVER"
alias: integration_rootless
only_if: *not_build_docs
Expand Down Expand Up @@ -293,7 +292,7 @@
always:
<<: *standardlogs

in_podman_task:

Check warning on line 295 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L295 

task "Containerized Integration" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 295 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L295 

task "Containerized Integration" depends on task "Cross Compile", but their only_if conditions are different
name: "Containerized Integration"
alias: in_podman
only_if: *not_build_docs
Expand All @@ -320,7 +319,7 @@
# Status aggregator for all tests. This task simply ensures a defined
# set of tasks all passed, and allows confirming that based on the status
# of this task.
success_task:

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Debian Conformance w/ vfs", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Debian Conformance w/ overlay", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Integration fedora-41 w/ vfs", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Integration fedora-41 w/ overlay", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 322 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L322 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different
# N/B: The prow merge-bot (tide) is sensitized to this exact name, DO NOT CHANGE IT.
# Ref: https://github.com/openshift/release/pull/48909
name: "Total Success"
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ go 1.22.6
require (
github.com/containerd/platforms v0.2.1
github.com/containernetworking/cni v1.2.3
github.com/containers/common v0.61.0
github.com/containers/image/v5 v5.33.0
github.com/containers/common v0.61.1
github.com/containers/image/v5 v5.33.1
github.com/containers/luksy v0.0.0-20241007190014-e2530d691420
github.com/containers/ocicrypt v1.2.0
github.com/containers/storage v1.56.0
github.com/containers/storage v1.56.1
github.com/cyphar/filepath-securejoin v0.3.4
github.com/docker/distribution v2.8.3+incompatible
github.com/docker/docker v27.3.1+incompatible
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8F
github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ=
github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
github.com/containers/common v0.61.0 h1:j/84PTqZIKKYy42OEJsZmjZ4g4Kq2ERuC3tqp2yWdh4=
github.com/containers/common v0.61.0/go.mod h1:NGRISq2vTFPSbhNqj6MLwyes4tWSlCnqbJg7R77B8xc=
github.com/containers/image/v5 v5.33.0 h1:6oPEFwTurf7pDTGw7TghqGs8K0+OvPtY/UyzU0B2DfE=
github.com/containers/image/v5 v5.33.0/go.mod h1:T7HpASmvnp2H1u4cyckMvCzLuYgpD18dSmabSw0AcHk=
github.com/containers/common v0.61.1 h1:jpk385ZFEx3MAX+sjwOoTZElvpgsGi0YJHuRmrhF/j8=
github.com/containers/common v0.61.1/go.mod h1:C+TfkhTV+ADp1Hu+BMIAYPvSFix21swYo9PZuCKoSUM=
github.com/containers/image/v5 v5.33.1 h1:nTWKwxAlY0aJrilvvhssqssJVnley6VqxkLiLzTEYIs=
github.com/containers/image/v5 v5.33.1/go.mod h1:/FJiLlvVbeBxWNMPVPPIWJxHTAzwBoFvyN0a51zo1CE=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
github.com/containers/luksy v0.0.0-20241007190014-e2530d691420 h1:57rxgU2wdI3lZMDZtao09WjCWmxBKOxI/Sj37IpCV50=
github.com/containers/luksy v0.0.0-20241007190014-e2530d691420/go.mod h1:MYzFCudLgMcXgFl7XuFjUowNDTBqL09BfEgMf7QHtO4=
github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sirVuPM=
github.com/containers/ocicrypt v1.2.0/go.mod h1:ZNviigQajtdlxIZGibvblVuIFBKIuUI2M0QM12SD31U=
github.com/containers/storage v1.56.0 h1:DZ9KSkj6M2tvj/4bBoaJu3QDHRl35BwsZ4kmLJS97ZI=
github.com/containers/storage v1.56.0/go.mod h1:c6WKowcAlED/DkWGNuL9bvGYqIWCVy7isRMdCSKWNjk=
github.com/containers/storage v1.56.1 h1:gDZj/S6Zxus4Xx42X6iNB3ODXuh0qoOdH/BABfrvcKo=
github.com/containers/storage v1.56.1/go.mod h1:c6WKowcAlED/DkWGNuL9bvGYqIWCVy7isRMdCSKWNjk=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand Down
25 changes: 19 additions & 6 deletions vendor/github.com/containers/common/libnetwork/pasta/pasta_linux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/common/version/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/image/v5/version/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/storage/VERSION
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 19 additions & 10 deletions vendor/github.com/containers/storage/layers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ github.com/containernetworking/cni/pkg/version
# github.com/containernetworking/plugins v1.5.1
## explicit; go 1.20
github.com/containernetworking/plugins/pkg/ns
# github.com/containers/common v0.61.0
# github.com/containers/common v0.61.1
## explicit; go 1.22.6
github.com/containers/common/internal
github.com/containers/common/internal/attributedstring
Expand Down Expand Up @@ -152,7 +152,7 @@ github.com/containers/common/pkg/umask
github.com/containers/common/pkg/util
github.com/containers/common/pkg/version
github.com/containers/common/version
# github.com/containers/image/v5 v5.33.0
# github.com/containers/image/v5 v5.33.1
## explicit; go 1.22.6
github.com/containers/image/v5/copy
github.com/containers/image/v5/directory
Expand Down Expand Up @@ -244,7 +244,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7
github.com/containers/ocicrypt/spec
github.com/containers/ocicrypt/utils
github.com/containers/ocicrypt/utils/keyprovider
# github.com/containers/storage v1.56.0
# github.com/containers/storage v1.56.1
## explicit; go 1.22.0
github.com/containers/storage
github.com/containers/storage/drivers
Expand Down