github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2026-05-04 10:22:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2848 from containers/renovate/common-image-and-storage-deps

Browse Source 
Update common, image, and storage deps to 129af75
This commit is contained in:
Miloslav Trmač
2026-04-14 20:03:38 +02:00
committed by GitHub
parent 4e9bd3d331 aed4196f22
commit 61fbb9221f
6 changed files with 14 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@@ -17,9 +17,9 @@ require (
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
go.podman.io/common v0.67.2-0.20260413135412-45087b503cf0
go.podman.io/image/v5 v5.39.3-0.20260413135412-45087b503cf0
go.podman.io/storage v1.62.1-0.20260413135412-45087b503cf0
go.podman.io/common v0.67.2-0.20260414164552-129af756cb52
go.podman.io/image/v5 v5.39.3-0.20260414164552-129af756cb52
go.podman.io/storage v1.62.1-0.20260414164552-129af756cb52
golang.org/x/term v0.42.0
gopkg.in/yaml.v3 v3.0.1
)

12
go.sum
View File

@@ -233,12 +233,12 @@ go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9
go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc=
go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY=
go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
go.podman.io/common v0.67.2-0.20260413135412-45087b503cf0 h1:NZ+tcMPMKNrGrZ00omZqoSIc1wadu8PRdyOHkJBklWk=
go.podman.io/common v0.67.2-0.20260413135412-45087b503cf0/go.mod h1:AeBF2hyuss6foeRKq3S3P/dp2Nn6oWGK9MRs8ir24FE=
go.podman.io/image/v5 v5.39.3-0.20260413135412-45087b503cf0 h1:LAjSXVMI9QJKHI8Q3gwyuqUhAABOpw2u/3Id5Fo/zgA=
go.podman.io/image/v5 v5.39.3-0.20260413135412-45087b503cf0/go.mod h1:3qIrf50O6uaXcguN2QpnFUY8Euaz+5QlMT5/pJLq+Rw=
go.podman.io/storage v1.62.1-0.20260413135412-45087b503cf0 h1:tHHGsri57ePmhvrnbf7pb3gTeED9prjbzLOW1PWESWk=
go.podman.io/storage v1.62.1-0.20260413135412-45087b503cf0/go.mod h1:cmaK5fvO1TM9Pq2HWxnG7xZcavs21tKzKujPxwfHOQQ=
go.podman.io/common v0.67.2-0.20260414164552-129af756cb52 h1:vsIDrJcDBw9vnxWPGlRkDUzFSe65pMLMEKWp7GYdPPI=
go.podman.io/common v0.67.2-0.20260414164552-129af756cb52/go.mod h1:AeBF2hyuss6foeRKq3S3P/dp2Nn6oWGK9MRs8ir24FE=
go.podman.io/image/v5 v5.39.3-0.20260414164552-129af756cb52 h1:dtIjNxScOne2sDcUwhIeG7Rpd00PZVA+BSTj8MoE26I=
go.podman.io/image/v5 v5.39.3-0.20260414164552-129af756cb52/go.mod h1:mNwOBYhhMKUYgJ192WMGHkH9ENhZyEUVqDIuUEl9crU=
go.podman.io/storage v1.62.1-0.20260414164552-129af756cb52 h1:J2HduLv27e3ALIwc4IiZQOrbrsxUVUOOqFvoBQJCbd0=
go.podman.io/storage v1.62.1-0.20260414164552-129af756cb52/go.mod h1:cmaK5fvO1TM9Pq2HWxnG7xZcavs21tKzKujPxwfHOQQ=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

12
vendor/go.podman.io/image/v5/docker/daemon/daemon_dest.go generated vendored
View File

@@ -7,6 +7,7 @@ import (
"fmt"
"io"
"github.com/moby/moby/api/types/jsonstream"
"github.com/moby/moby/client"
"github.com/sirupsen/logrus"
"go.podman.io/image/v5/docker/internal/tarfile"
@@ -95,18 +96,9 @@ func imageLoad(ctx context.Context, c *client.Client, reader *io.PipeReader) err
}
defer res.Close()
// jsonError and jsonMessage are small subsets of docker/docker/pkg/jsonmessage.JSONError and JSONMessage,
// copied here to minimize dependencies.
type jsonError struct {
Message string `json:"message,omitempty"`
}
type jsonMessage struct {
Error *jsonError `json:"errorDetail,omitempty"`
}
dec := json.NewDecoder(res)
for {
var msg jsonMessage
var msg jsonstream.Message
if err := dec.Decode(&msg); err != nil {
if err == io.EOF {
break

213
vendor/go.podman.io/storage/deprecated.go generated vendored
View File

@@ -1,213 +0,0 @@
package storage
import (
"io"
"time"
digest "github.com/opencontainers/go-digest"
drivers "go.podman.io/storage/drivers"
"go.podman.io/storage/pkg/archive"
)
// The type definitions in this file exist ONLY to maintain formal API compatibility.
// DO NOT ADD ANY NEW METHODS TO THESE INTERFACES.
// ROFileBasedStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ROFileBasedStore interface {
Locker
Load() error
ReloadIfChanged() error
}
// RWFileBasedStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type RWFileBasedStore interface {
Save() error
}
// FileBasedStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type FileBasedStore interface {
ROFileBasedStore
RWFileBasedStore
}
// ROMetadataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ROMetadataStore interface {
Metadata(id string) (string, error)
}
// RWMetadataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type RWMetadataStore interface {
SetMetadata(id, metadata string) error
}
// MetadataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type MetadataStore interface {
ROMetadataStore
RWMetadataStore
}
// ROBigDataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ROBigDataStore interface {
BigData(id, key string) ([]byte, error)
BigDataSize(id, key string) (int64, error)
BigDataDigest(id, key string) (digest.Digest, error)
BigDataNames(id string) ([]string, error)
}
// RWImageBigDataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type RWImageBigDataStore interface {
SetBigData(id, key string, data []byte, digestManifest func([]byte) (digest.Digest, error)) error
}
// ContainerBigDataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ContainerBigDataStore interface {
ROBigDataStore
SetBigData(id, key string, data []byte) error
}
// ROLayerBigDataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ROLayerBigDataStore interface {
BigData(id, key string) (io.ReadCloser, error)
BigDataNames(id string) ([]string, error)
}
// RWLayerBigDataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type RWLayerBigDataStore interface {
SetBigData(id, key string, data io.Reader) error
}
// LayerBigDataStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type LayerBigDataStore interface {
ROLayerBigDataStore
RWLayerBigDataStore
}
// FlaggableStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type FlaggableStore interface {
ClearFlag(id string, flag string) error
SetFlag(id string, flag string, value any) error
}
// ContainerStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ContainerStore interface {
FileBasedStore
MetadataStore
ContainerBigDataStore
FlaggableStore
Create(id string, names []string, image, layer, metadata string, options *ContainerOptions) (*Container, error)
SetNames(id string, names []string) error
AddNames(id string, names []string) error
RemoveNames(id string, names []string) error
Get(id string) (*Container, error)
Exists(id string) bool
Delete(id string) error
Wipe() error
Lookup(name string) (string, error)
Containers() ([]Container, error)
}
// ROImageStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ROImageStore interface {
ROFileBasedStore
ROMetadataStore
ROBigDataStore
Exists(id string) bool
Get(id string) (*Image, error)
Lookup(name string) (string, error)
Images() ([]Image, error)
ByDigest(d digest.Digest) ([]*Image, error)
}
// ImageStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ImageStore interface {
ROImageStore
RWFileBasedStore
RWMetadataStore
RWImageBigDataStore
FlaggableStore
Create(id string, names []string, layer, metadata string, created time.Time, searchableDigest digest.Digest) (*Image, error)
SetNames(id string, names []string) error
AddNames(id string, names []string) error
RemoveNames(id string, names []string) error
Delete(id string) error
Wipe() error
}
// ROLayerStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type ROLayerStore interface {
ROFileBasedStore
ROMetadataStore
ROLayerBigDataStore
Exists(id string) bool
Get(id string) (*Layer, error)
Status() ([][2]string, error)
Changes(from, to string) ([]archive.Change, error)
Diff(from, to string, options *DiffOptions) (io.ReadCloser, error)
DiffSize(from, to string) (int64, error)
Size(name string) (int64, error)
Lookup(name string) (string, error)
LayersByCompressedDigest(d digest.Digest) ([]Layer, error)
LayersByUncompressedDigest(d digest.Digest) ([]Layer, error)
Layers() ([]Layer, error)
}
// LayerStore is a deprecated interface with no documented way to use it from callers outside of c/storage.
//
// Deprecated: There is no way to use this from any external user of c/storage to invoke c/storage functionality.
type LayerStore interface {
ROLayerStore
RWFileBasedStore
RWMetadataStore
FlaggableStore
RWLayerBigDataStore
Create(id string, parent *Layer, names []string, mountLabel string, options map[string]string, moreOptions *LayerOptions, writeable bool) (*Layer, error)
CreateWithFlags(id string, parent *Layer, names []string, mountLabel string, options map[string]string, moreOptions *LayerOptions, writeable bool, flags map[string]any) (layer *Layer, err error)
Put(id string, parent *Layer, names []string, mountLabel string, options map[string]string, moreOptions *LayerOptions, writeable bool, flags map[string]any, diff io.Reader) (*Layer, int64, error)
SetNames(id string, names []string) error
AddNames(id string, names []string) error
RemoveNames(id string, names []string) error
Delete(id string) error
Wipe() error
Mount(id string, options drivers.MountOpts) (string, error)
Unmount(id string, force bool) (bool, error)
Mounted(id string) (int, error)
ParentOwners(id string) (uids, gids []int, err error)
ApplyDiff(to string, diff io.Reader) (int64, error)
DifferTarget(id string) (string, error)
LoadLocked() error
PutAdditionalLayer(id string, parentLayer *Layer, names []string, aLayer drivers.AdditionalLayer) (layer *Layer, err error)
}

18
vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go generated vendored
View File

@@ -1,18 +0,0 @@
package mount
import (
"fmt"
"os"
"github.com/moby/sys/mountinfo"
)
func PidMountInfo(pid int) ([]*Info, error) {
f, err := os.Open(fmt.Sprintf("/proc/%d/mountinfo", pid))
if err != nil {
return nil, err
}
defer f.Close()
return mountinfo.GetMountsFromReader(f, nil)
}

6
vendor/modules.txt vendored
View File

@@ -360,7 +360,7 @@ go.opentelemetry.io/otel/trace
go.opentelemetry.io/otel/trace/embedded
go.opentelemetry.io/otel/trace/internal/telemetry
go.opentelemetry.io/otel/trace/noop
# go.podman.io/common v0.67.2-0.20260413135412-45087b503cf0
# go.podman.io/common v0.67.2-0.20260414164552-129af756cb52
## explicit; go 1.25.6
go.podman.io/common/pkg/auth
go.podman.io/common/pkg/capabilities
@@ -371,7 +371,7 @@ go.podman.io/common/pkg/password
go.podman.io/common/pkg/report
go.podman.io/common/pkg/report/camelcase
go.podman.io/common/pkg/retry
# go.podman.io/image/v5 v5.39.3-0.20260413135412-45087b503cf0
# go.podman.io/image/v5 v5.39.3-0.20260414164552-129af756cb52
## explicit; go 1.25.6
go.podman.io/image/v5/copy
go.podman.io/image/v5/directory
@@ -446,7 +446,7 @@ go.podman.io/image/v5/transports
go.podman.io/image/v5/transports/alltransports
go.podman.io/image/v5/types
go.podman.io/image/v5/version
# go.podman.io/storage v1.62.1-0.20260413135412-45087b503cf0
# go.podman.io/storage v1.62.1-0.20260414164552-129af756cb52
## explicit; go 1.25.0
go.podman.io/storage
go.podman.io/storage/drivers