mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
Bump c/image to v5.26.0, c/common 0.54.0
Bumping these two in preparation for Podman v4.6 and eventuall RHEL 8.9/9.3 [NO NEW TESTS NEEDED] Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
This commit is contained in:
4
go.mod
4
go.mod
@ -13,9 +13,9 @@ require (
|
|||||||
github.com/containernetworking/cni v1.1.2
|
github.com/containernetworking/cni v1.1.2
|
||||||
github.com/containernetworking/plugins v1.3.0
|
github.com/containernetworking/plugins v1.3.0
|
||||||
github.com/containers/buildah v1.30.1-0.20230627110136-33b7088fec7b
|
github.com/containers/buildah v1.30.1-0.20230627110136-33b7088fec7b
|
||||||
github.com/containers/common v0.53.1-0.20230627061926-e6f314e59b81
|
github.com/containers/common v0.54.0
|
||||||
github.com/containers/conmon v2.0.20+incompatible
|
github.com/containers/conmon v2.0.20+incompatible
|
||||||
github.com/containers/image/v5 v5.25.1-0.20230623174242-68798a22ce3e
|
github.com/containers/image/v5 v5.26.0
|
||||||
github.com/containers/libhvee v0.0.5
|
github.com/containers/libhvee v0.0.5
|
||||||
github.com/containers/ocicrypt v1.1.7
|
github.com/containers/ocicrypt v1.1.7
|
||||||
github.com/containers/psgo v1.8.0
|
github.com/containers/psgo v1.8.0
|
||||||
|
8
go.sum
8
go.sum
@ -241,12 +241,12 @@ github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q
|
|||||||
github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0=
|
github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0=
|
||||||
github.com/containers/buildah v1.30.1-0.20230627110136-33b7088fec7b h1:cTb0Sxu/tIQ9uPIchFmkYs+uOtylhyO+0h2+i3XzisQ=
|
github.com/containers/buildah v1.30.1-0.20230627110136-33b7088fec7b h1:cTb0Sxu/tIQ9uPIchFmkYs+uOtylhyO+0h2+i3XzisQ=
|
||||||
github.com/containers/buildah v1.30.1-0.20230627110136-33b7088fec7b/go.mod h1:O2jiDd5+569W8cwqyLnRKiqAHOPTi/Kj+oDlFNsFg24=
|
github.com/containers/buildah v1.30.1-0.20230627110136-33b7088fec7b/go.mod h1:O2jiDd5+569W8cwqyLnRKiqAHOPTi/Kj+oDlFNsFg24=
|
||||||
github.com/containers/common v0.53.1-0.20230627061926-e6f314e59b81 h1:axB9UaqlBcpVX4yA41OfshJd5emqOuQ/GMNxopyAX20=
|
github.com/containers/common v0.54.0 h1:jJ2QVuliTa/40QxyDe1ZS1U/7BsDea7qdBeZE0VPu3E=
|
||||||
github.com/containers/common v0.53.1-0.20230627061926-e6f314e59b81/go.mod h1:BkgcpfdNC54M3fGDtHUjqt7teGNsuj9yGoWUC+YVhi4=
|
github.com/containers/common v0.54.0/go.mod h1:xbA3bUfth8p2xmqSg01oxHNDRJA71SAVUCqhyEISKic=
|
||||||
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
|
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
|
||||||
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
|
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
|
||||||
github.com/containers/image/v5 v5.25.1-0.20230623174242-68798a22ce3e h1:4W/7KRo29f7zRGRruc3kSf18wNZB/loR1jTygi0TvRM=
|
github.com/containers/image/v5 v5.26.0 h1:P9H4+N/7fTTClnFthIWgJU+0LBkhGlW2tCWR+UNG0Vs=
|
||||||
github.com/containers/image/v5 v5.25.1-0.20230623174242-68798a22ce3e/go.mod h1:3tWjWAL5TC/ZsaaBNkvTxdQqvlNJ463QF51m+oRtZwI=
|
github.com/containers/image/v5 v5.26.0/go.mod h1:QSW67adLL/B4eYsFPG6TjH5Ye4LiLazPAGWk5oQnUdQ=
|
||||||
github.com/containers/libhvee v0.0.5 h1:5tUiF2eVe8XbVSPD/Os4dIU1gJWoQgtkQHIjQ5X7wpE=
|
github.com/containers/libhvee v0.0.5 h1:5tUiF2eVe8XbVSPD/Os4dIU1gJWoQgtkQHIjQ5X7wpE=
|
||||||
github.com/containers/libhvee v0.0.5/go.mod h1:AYsyMe44w9ylWWEZNW+IOzA7oZ2i/P9TChNljavhYMI=
|
github.com/containers/libhvee v0.0.5/go.mod h1:AYsyMe44w9ylWWEZNW+IOzA7oZ2i/P9TChNljavhYMI=
|
||||||
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
|
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
|
||||||
|
4
vendor/github.com/containers/common/pkg/config/config_darwin.go
generated
vendored
4
vendor/github.com/containers/common/pkg/config/config_darwin.go
generated
vendored
@ -30,9 +30,9 @@ func ifRootlessConfigPath() (string, error) {
|
|||||||
|
|
||||||
var defaultHelperBinariesDir = []string{
|
var defaultHelperBinariesDir = []string{
|
||||||
// Homebrew install paths
|
// Homebrew install paths
|
||||||
"/usr/local/opt/podman/libexec",
|
"/usr/local/opt/podman/libexec/podman",
|
||||||
|
"/opt/homebrew/opt/podman/libexec/podman",
|
||||||
"/opt/homebrew/bin",
|
"/opt/homebrew/bin",
|
||||||
"/opt/homebrew/opt/podman/libexec",
|
|
||||||
"/usr/local/bin",
|
"/usr/local/bin",
|
||||||
// default paths
|
// default paths
|
||||||
"/usr/local/libexec/podman",
|
"/usr/local/libexec/podman",
|
||||||
|
2
vendor/github.com/containers/common/version/version.go
generated
vendored
2
vendor/github.com/containers/common/version/version.go
generated
vendored
@ -1,4 +1,4 @@
|
|||||||
package version
|
package version
|
||||||
|
|
||||||
// Version is the version of the build.
|
// Version is the version of the build.
|
||||||
const Version = "0.54.0-dev"
|
const Version = "0.54.0"
|
||||||
|
5
vendor/github.com/containers/image/v5/internal/manifest/list.go
generated
vendored
5
vendor/github.com/containers/image/v5/internal/manifest/list.go
generated
vendored
@ -3,6 +3,7 @@ package manifest
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
compression "github.com/containers/image/v5/pkg/compression/types"
|
||||||
"github.com/containers/image/v5/types"
|
"github.com/containers/image/v5/types"
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
@ -86,6 +87,9 @@ type ListEdit struct {
|
|||||||
UpdateDigest digest.Digest
|
UpdateDigest digest.Digest
|
||||||
UpdateSize int64
|
UpdateSize int64
|
||||||
UpdateMediaType string
|
UpdateMediaType string
|
||||||
|
UpdateAffectAnnotations bool
|
||||||
|
UpdateAnnotations map[string]string
|
||||||
|
UpdateCompressionAlgorithms []compression.Algorithm
|
||||||
|
|
||||||
// If Op = ListEditAdd. All fields must be set.
|
// If Op = ListEditAdd. All fields must be set.
|
||||||
AddDigest digest.Digest
|
AddDigest digest.Digest
|
||||||
@ -93,6 +97,7 @@ type ListEdit struct {
|
|||||||
AddMediaType string
|
AddMediaType string
|
||||||
AddPlatform *imgspecv1.Platform
|
AddPlatform *imgspecv1.Platform
|
||||||
AddAnnotations map[string]string
|
AddAnnotations map[string]string
|
||||||
|
AddCompressionAlgorithms []compression.Algorithm
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListPublicFromBlob parses a list of manifests.
|
// ListPublicFromBlob parses a list of manifests.
|
||||||
|
38
vendor/github.com/containers/image/v5/internal/manifest/oci_index.go
generated
vendored
38
vendor/github.com/containers/image/v5/internal/manifest/oci_index.go
generated
vendored
@ -7,6 +7,7 @@ import (
|
|||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
platform "github.com/containers/image/v5/internal/pkg/platform"
|
platform "github.com/containers/image/v5/internal/pkg/platform"
|
||||||
|
compression "github.com/containers/image/v5/pkg/compression/types"
|
||||||
"github.com/containers/image/v5/types"
|
"github.com/containers/image/v5/types"
|
||||||
"github.com/opencontainers/go-digest"
|
"github.com/opencontainers/go-digest"
|
||||||
imgspec "github.com/opencontainers/image-spec/specs-go"
|
imgspec "github.com/opencontainers/image-spec/specs-go"
|
||||||
@ -23,6 +24,7 @@ const (
|
|||||||
// Zstd compression, so it can be preferred by compatible consumers over instances that
|
// Zstd compression, so it can be preferred by compatible consumers over instances that
|
||||||
// use gzip, depending on their local policy.
|
// use gzip, depending on their local policy.
|
||||||
OCI1InstanceAnnotationCompressionZSTD = "io.github.containers.compression.zstd"
|
OCI1InstanceAnnotationCompressionZSTD = "io.github.containers.compression.zstd"
|
||||||
|
OCI1InstanceAnnotationCompressionZSTDValue = "true"
|
||||||
)
|
)
|
||||||
|
|
||||||
// OCI1IndexPublic is just an alias for the OCI index type, but one which we can
|
// OCI1IndexPublic is just an alias for the OCI index type, but one which we can
|
||||||
@ -76,8 +78,23 @@ func (index *OCI1IndexPublic) UpdateInstances(updates []ListUpdate) error {
|
|||||||
return index.editInstances(editInstances)
|
return index.editInstances(editInstances)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func addCompressionAnnotations(compressionAlgorithms []compression.Algorithm, annotationsMap map[string]string) {
|
||||||
|
// TODO: This should also delete the algorithm if map already contains an algorithm and compressionAlgorithm
|
||||||
|
// list has a different algorithm. To do that, we would need to modify the callers to always provide a reliable
|
||||||
|
// and full compressionAlghorithms list.
|
||||||
|
for _, algo := range compressionAlgorithms {
|
||||||
|
switch algo.Name() {
|
||||||
|
case compression.ZstdAlgorithmName:
|
||||||
|
annotationsMap[OCI1InstanceAnnotationCompressionZSTD] = OCI1InstanceAnnotationCompressionZSTDValue
|
||||||
|
default:
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (index *OCI1IndexPublic) editInstances(editInstances []ListEdit) error {
|
func (index *OCI1IndexPublic) editInstances(editInstances []ListEdit) error {
|
||||||
addedEntries := []imgspecv1.Descriptor{}
|
addedEntries := []imgspecv1.Descriptor{}
|
||||||
|
updatedAnnotations := false
|
||||||
for i, editInstance := range editInstances {
|
for i, editInstance := range editInstances {
|
||||||
switch editInstance.ListOperation {
|
switch editInstance.ListOperation {
|
||||||
case ListOpUpdate:
|
case ListOpUpdate:
|
||||||
@ -102,19 +119,38 @@ func (index *OCI1IndexPublic) editInstances(editInstances []ListEdit) error {
|
|||||||
return fmt.Errorf("update %d of %d passed to OCI1Index.UpdateInstances had no media type (was %q)", i+1, len(editInstances), index.Manifests[i].MediaType)
|
return fmt.Errorf("update %d of %d passed to OCI1Index.UpdateInstances had no media type (was %q)", i+1, len(editInstances), index.Manifests[i].MediaType)
|
||||||
}
|
}
|
||||||
index.Manifests[targetIndex].MediaType = editInstance.UpdateMediaType
|
index.Manifests[targetIndex].MediaType = editInstance.UpdateMediaType
|
||||||
|
if editInstance.UpdateAnnotations != nil {
|
||||||
|
updatedAnnotations = true
|
||||||
|
if editInstance.UpdateAffectAnnotations {
|
||||||
|
index.Manifests[targetIndex].Annotations = maps.Clone(editInstance.UpdateAnnotations)
|
||||||
|
} else {
|
||||||
|
if index.Manifests[targetIndex].Annotations == nil {
|
||||||
|
index.Manifests[targetIndex].Annotations = map[string]string{}
|
||||||
|
}
|
||||||
|
maps.Copy(index.Manifests[targetIndex].Annotations, editInstance.UpdateAnnotations)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
addCompressionAnnotations(editInstance.UpdateCompressionAlgorithms, index.Manifests[targetIndex].Annotations)
|
||||||
case ListOpAdd:
|
case ListOpAdd:
|
||||||
|
annotations := map[string]string{}
|
||||||
|
if editInstance.AddAnnotations != nil {
|
||||||
|
annotations = maps.Clone(editInstance.AddAnnotations)
|
||||||
|
}
|
||||||
|
addCompressionAnnotations(editInstance.AddCompressionAlgorithms, annotations)
|
||||||
addedEntries = append(addedEntries, imgspecv1.Descriptor{
|
addedEntries = append(addedEntries, imgspecv1.Descriptor{
|
||||||
MediaType: editInstance.AddMediaType,
|
MediaType: editInstance.AddMediaType,
|
||||||
Size: editInstance.AddSize,
|
Size: editInstance.AddSize,
|
||||||
Digest: editInstance.AddDigest,
|
Digest: editInstance.AddDigest,
|
||||||
Platform: editInstance.AddPlatform,
|
Platform: editInstance.AddPlatform,
|
||||||
Annotations: editInstance.AddAnnotations})
|
Annotations: annotations})
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("internal error: invalid operation: %d", editInstance.ListOperation)
|
return fmt.Errorf("internal error: invalid operation: %d", editInstance.ListOperation)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(addedEntries) != 0 {
|
if len(addedEntries) != 0 {
|
||||||
index.Manifests = append(index.Manifests, addedEntries...)
|
index.Manifests = append(index.Manifests, addedEntries...)
|
||||||
|
}
|
||||||
|
if len(addedEntries) != 0 || updatedAnnotations {
|
||||||
slices.SortStableFunc(index.Manifests, func(a, b imgspecv1.Descriptor) bool {
|
slices.SortStableFunc(index.Manifests, func(a, b imgspecv1.Descriptor) bool {
|
||||||
return !instanceIsZstd(a) && instanceIsZstd(b)
|
return !instanceIsZstd(a) && instanceIsZstd(b)
|
||||||
})
|
})
|
||||||
|
6
vendor/github.com/containers/image/v5/version/version.go
generated
vendored
6
vendor/github.com/containers/image/v5/version/version.go
generated
vendored
@ -6,12 +6,12 @@ const (
|
|||||||
// VersionMajor is for an API incompatible changes
|
// VersionMajor is for an API incompatible changes
|
||||||
VersionMajor = 5
|
VersionMajor = 5
|
||||||
// VersionMinor is for functionality in a backwards-compatible manner
|
// VersionMinor is for functionality in a backwards-compatible manner
|
||||||
VersionMinor = 25
|
VersionMinor = 26
|
||||||
// VersionPatch is for backwards-compatible bug fixes
|
// VersionPatch is for backwards-compatible bug fixes
|
||||||
VersionPatch = 1
|
VersionPatch = 0
|
||||||
|
|
||||||
// VersionDev indicates development branch. Releases will be empty string.
|
// VersionDev indicates development branch. Releases will be empty string.
|
||||||
VersionDev = "-dev"
|
VersionDev = ""
|
||||||
)
|
)
|
||||||
|
|
||||||
// Version is the specification version that the package types support.
|
// Version is the specification version that the package types support.
|
||||||
|
4
vendor/modules.txt
vendored
4
vendor/modules.txt
vendored
@ -128,7 +128,7 @@ github.com/containers/buildah/pkg/rusage
|
|||||||
github.com/containers/buildah/pkg/sshagent
|
github.com/containers/buildah/pkg/sshagent
|
||||||
github.com/containers/buildah/pkg/util
|
github.com/containers/buildah/pkg/util
|
||||||
github.com/containers/buildah/util
|
github.com/containers/buildah/util
|
||||||
# github.com/containers/common v0.53.1-0.20230627061926-e6f314e59b81
|
# github.com/containers/common v0.54.0
|
||||||
## explicit; go 1.18
|
## explicit; go 1.18
|
||||||
github.com/containers/common/libimage
|
github.com/containers/common/libimage
|
||||||
github.com/containers/common/libimage/define
|
github.com/containers/common/libimage/define
|
||||||
@ -186,7 +186,7 @@ github.com/containers/common/version
|
|||||||
# github.com/containers/conmon v2.0.20+incompatible
|
# github.com/containers/conmon v2.0.20+incompatible
|
||||||
## explicit
|
## explicit
|
||||||
github.com/containers/conmon/runner/config
|
github.com/containers/conmon/runner/config
|
||||||
# github.com/containers/image/v5 v5.25.1-0.20230623174242-68798a22ce3e
|
# github.com/containers/image/v5 v5.26.0
|
||||||
## explicit; go 1.18
|
## explicit; go 1.18
|
||||||
github.com/containers/image/v5/copy
|
github.com/containers/image/v5/copy
|
||||||
github.com/containers/image/v5/directory
|
github.com/containers/image/v5/directory
|
||||||
|
Reference in New Issue
Block a user