mirror of
https://github.com/containers/podman.git
synced 2025-06-28 22:53:21 +08:00
vendor: bump c/common
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
2
go.mod
2
go.mod
@ -13,7 +13,7 @@ require (
|
|||||||
github.com/checkpoint-restore/go-criu/v7 v7.1.0
|
github.com/checkpoint-restore/go-criu/v7 v7.1.0
|
||||||
github.com/containernetworking/plugins v1.5.1
|
github.com/containernetworking/plugins v1.5.1
|
||||||
github.com/containers/buildah v1.37.0
|
github.com/containers/buildah v1.37.0
|
||||||
github.com/containers/common v0.60.0
|
github.com/containers/common v0.60.1-0.20240731140509-ae4a61e1b2e0
|
||||||
github.com/containers/conmon v2.0.20+incompatible
|
github.com/containers/conmon v2.0.20+incompatible
|
||||||
github.com/containers/gvisor-tap-vsock v0.7.4
|
github.com/containers/gvisor-tap-vsock v0.7.4
|
||||||
github.com/containers/image/v5 v5.32.0
|
github.com/containers/image/v5 v5.32.0
|
||||||
|
4
go.sum
4
go.sum
@ -79,8 +79,8 @@ github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+
|
|||||||
github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
|
github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
|
||||||
github.com/containers/buildah v1.37.0 h1:jvHwu1vIwIqnHyOSg9eef9Apdpry+5oWLrm43gdf8Rk=
|
github.com/containers/buildah v1.37.0 h1:jvHwu1vIwIqnHyOSg9eef9Apdpry+5oWLrm43gdf8Rk=
|
||||||
github.com/containers/buildah v1.37.0/go.mod h1:MKd79tkluMf6vtH06SedhBQK5OB7E0pFVIuiTTw3dJk=
|
github.com/containers/buildah v1.37.0/go.mod h1:MKd79tkluMf6vtH06SedhBQK5OB7E0pFVIuiTTw3dJk=
|
||||||
github.com/containers/common v0.60.0 h1:QMNygqiiit9LU/yqee9Dv0N0oQ+rQq41ElfdOBQtw7w=
|
github.com/containers/common v0.60.1-0.20240731140509-ae4a61e1b2e0 h1:WqC1NUmYpiEIqYoy+44TFvYEUYO5oBlDOdFZ2I0S1Vo=
|
||||||
github.com/containers/common v0.60.0/go.mod h1:dtKVe11xkV89tqzRX9s/B0ORjeB2dy5UB46aGjunMn8=
|
github.com/containers/common v0.60.1-0.20240731140509-ae4a61e1b2e0/go.mod h1:k0URVvOTicn3w0y4qc31Ughcb9n28atRHfjd0NpkCiA=
|
||||||
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/gvisor-tap-vsock v0.7.4 h1:iOtr/KEi+r599OOx1+9Qbss91jD5yxh1HO35MKTdths=
|
github.com/containers/gvisor-tap-vsock v0.7.4 h1:iOtr/KEi+r599OOx1+9Qbss91jD5yxh1HO35MKTdths=
|
||||||
|
19
vendor/github.com/containers/common/libimage/manifest_list.go
generated
vendored
19
vendor/github.com/containers/common/libimage/manifest_list.go
generated
vendored
@ -309,14 +309,14 @@ type ManifestListAddOptions struct {
|
|||||||
Password string
|
Password string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *ManifestList) parseNameToExtantReference(ctx context.Context, name string, manifestList bool, what string) (types.ImageReference, error) {
|
func (m *ManifestList) parseNameToExtantReference(ctx context.Context, sys *types.SystemContext, name string, manifestList bool, what string) (types.ImageReference, error) {
|
||||||
ref, err := alltransports.ParseImageName(name)
|
ref, err := alltransports.ParseImageName(name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
withDocker := fmt.Sprintf("%s://%s", docker.Transport.Name(), name)
|
withDocker := fmt.Sprintf("%s://%s", docker.Transport.Name(), name)
|
||||||
ref, err = alltransports.ParseImageName(withDocker)
|
ref, err = alltransports.ParseImageName(withDocker)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
var src types.ImageSource
|
var src types.ImageSource
|
||||||
src, err = ref.NewImageSource(ctx, nil)
|
src, err = ref.NewImageSource(ctx, sys)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
src.Close()
|
src.Close()
|
||||||
}
|
}
|
||||||
@ -339,11 +339,6 @@ func (m *ManifestList) Add(ctx context.Context, name string, options *ManifestLi
|
|||||||
options = &ManifestListAddOptions{}
|
options = &ManifestListAddOptions{}
|
||||||
}
|
}
|
||||||
|
|
||||||
ref, err := m.parseNameToExtantReference(ctx, name, false, "image to add to manifest list")
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now massage in the copy-related options into the system context.
|
// Now massage in the copy-related options into the system context.
|
||||||
systemContext := m.image.runtime.systemContextCopy()
|
systemContext := m.image.runtime.systemContextCopy()
|
||||||
if options.AuthFilePath != "" {
|
if options.AuthFilePath != "" {
|
||||||
@ -363,6 +358,12 @@ func (m *ManifestList) Add(ctx context.Context, name string, options *ManifestLi
|
|||||||
Password: options.Password,
|
Password: options.Password,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ref, err := m.parseNameToExtantReference(ctx, systemContext, name, false, "image to add to manifest list")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
locker, err := manifests.LockerForImage(m.image.runtime.store, m.ID())
|
locker, err := manifests.LockerForImage(m.image.runtime.store, m.ID())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
@ -442,7 +443,7 @@ func (m *ManifestList) AddArtifact(ctx context.Context, options *ManifestListAdd
|
|||||||
opts.LayerMediaType = &options.LayerType
|
opts.LayerMediaType = &options.LayerType
|
||||||
}
|
}
|
||||||
if options.Subject != "" {
|
if options.Subject != "" {
|
||||||
ref, err := m.parseNameToExtantReference(ctx, options.Subject, true, "subject for artifact manifest")
|
ref, err := m.parseNameToExtantReference(ctx, nil, options.Subject, true, "subject for artifact manifest")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@ -547,7 +548,7 @@ func (m *ManifestList) AnnotateInstance(d digest.Digest, options *ManifestListAn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if options.Subject != "" {
|
if options.Subject != "" {
|
||||||
ref, err := m.parseNameToExtantReference(ctx, options.Subject, true, "subject for image index")
|
ref, err := m.parseNameToExtantReference(ctx, nil, options.Subject, true, "subject for image index")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
6
vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go
generated
vendored
6
vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go
generated
vendored
@ -130,6 +130,12 @@ func systemdDestroyConn(path string, c *systemdDbus.Conn) error {
|
|||||||
ch := make(chan string)
|
ch := make(chan string)
|
||||||
_, err := c.StopUnitContext(context.TODO(), name, "replace", ch)
|
_, err := c.StopUnitContext(context.TODO(), name, "replace", ch)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if dbe, ok := err.(dbus.Error); ok {
|
||||||
|
if dbe.Name == "org.freedesktop.systemd1.NoSuchUnit" {
|
||||||
|
// the unit was already removed
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
<-ch
|
<-ch
|
||||||
|
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.60.0"
|
const Version = "0.61.0-dev"
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -170,7 +170,7 @@ github.com/containers/buildah/pkg/sshagent
|
|||||||
github.com/containers/buildah/pkg/util
|
github.com/containers/buildah/pkg/util
|
||||||
github.com/containers/buildah/pkg/volumes
|
github.com/containers/buildah/pkg/volumes
|
||||||
github.com/containers/buildah/util
|
github.com/containers/buildah/util
|
||||||
# github.com/containers/common v0.60.0
|
# github.com/containers/common v0.60.1-0.20240731140509-ae4a61e1b2e0
|
||||||
## explicit; go 1.21.0
|
## explicit; go 1.21.0
|
||||||
github.com/containers/common/internal
|
github.com/containers/common/internal
|
||||||
github.com/containers/common/internal/attributedstring
|
github.com/containers/common/internal/attributedstring
|
||||||
|
Reference in New Issue
Block a user