github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-28 07:37:41 +00:00
Code Issues Projects Releases Wiki Activity

Update to image-spec v1.0.0 and revendor

Browse Source
This commit is contained in:
Miloslav Trmač 2017-07-20 16:19:56 +02:00
parent 2d168e3723
commit ca03debe59
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -25,7 +25,7 @@ github.com/docker/libtrust master
github.com/opencontainers/runc master github.com/opencontainers/runc master
github.com/opencontainers/image-spec v1.0.0 github.com/opencontainers/image-spec v1.0.0
# -- start OCI image validation requirements. # -- start OCI image validation requirements.
github.com/opencontainers/runtime-spec v1.0.0-rc4 github.com/opencontainers/runtime-spec v1.0.0
github.com/opencontainers/image-tools v0.1.0 github.com/opencontainers/image-tools v0.1.0
github.com/xeipuuv/gojsonschema master github.com/xeipuuv/gojsonschema master
github.com/xeipuuv/gojsonreference master github.com/xeipuuv/gojsonreference master

2
vendor/github.com/containers/image/docker/tarfile/dest.go generated vendored
View File

@ -181,7 +181,7 @@ func (d *Destination) PutManifest(m []byte) error {
layerPaths = append(layerPaths, l.Digest.String()) layerPaths = append(layerPaths, l.Digest.String())
} }
items := []manifestItem{{ items := []ManifestItem{{
Config: man.Config.Digest.String(), Config: man.Config.Digest.String(),
RepoTags: []string{d.repoTag}, RepoTags: []string{d.repoTag},
Layers: layerPaths, Layers: layerPaths,

10
vendor/github.com/containers/image/docker/tarfile/src.go generated vendored
View File

@ -20,7 +20,7 @@ import (
type Source struct { type Source struct {
tarPath string tarPath string
// The following data is only available after ensureCachedDataIsPresent() succeeds // The following data is only available after ensureCachedDataIsPresent() succeeds
tarManifest *manifestItem // nil if not available yet. tarManifest *ManifestItem // nil if not available yet.
configBytes []byte configBytes []byte
configDigest digest.Digest configDigest digest.Digest
orderedDiffIDList []diffID orderedDiffIDList []diffID
@ -175,13 +175,13 @@ func (s *Source) ensureCachedDataIsPresent() error {
} }
// loadTarManifest loads and decodes the manifest.json. // loadTarManifest loads and decodes the manifest.json.
func (s *Source) loadTarManifest() ([]manifestItem, error) { func (s *Source) loadTarManifest() ([]ManifestItem, error) {
// FIXME? Do we need to deal with the legacy format? // FIXME? Do we need to deal with the legacy format?
bytes, err := s.readTarComponent(manifestFileName) bytes, err := s.readTarComponent(manifestFileName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var items []manifestItem var items []ManifestItem
if err := json.Unmarshal(bytes, &items); err != nil { if err := json.Unmarshal(bytes, &items); err != nil {
return nil, errors.Wrap(err, "Error decoding tar manifest.json") return nil, errors.Wrap(err, "Error decoding tar manifest.json")
} }
@ -189,11 +189,11 @@ func (s *Source) loadTarManifest() ([]manifestItem, error) {
} }
// LoadTarManifest loads and decodes the manifest.json // LoadTarManifest loads and decodes the manifest.json
func (s *Source) LoadTarManifest() ([]manifestItem, error) { func (s *Source) LoadTarManifest() ([]ManifestItem, error) {
return s.loadTarManifest() return s.loadTarManifest()
} }
func (s *Source) prepareLayerData(tarManifest *manifestItem, parsedConfig *image) (map[diffID]*layerInfo, error) { func (s *Source) prepareLayerData(tarManifest *ManifestItem, parsedConfig *image) (map[diffID]*layerInfo, error) {
// Collect layer data available in manifest and config. // Collect layer data available in manifest and config.
if len(tarManifest.Layers) != len(parsedConfig.RootFS.DiffIDs) { if len(tarManifest.Layers) != len(parsedConfig.RootFS.DiffIDs) {
return nil, errors.Errorf("Inconsistent layer count: %d in manifest, %d in config", len(tarManifest.Layers), len(parsedConfig.RootFS.DiffIDs)) return nil, errors.Errorf("Inconsistent layer count: %d in manifest, %d in config", len(tarManifest.Layers), len(parsedConfig.RootFS.DiffIDs))

3
vendor/github.com/containers/image/docker/tarfile/types.go generated vendored
View File

@ -13,7 +13,8 @@ const (
// legacyRepositoriesFileName = "repositories" // legacyRepositoriesFileName = "repositories"
) )
type manifestItem struct { // ManifestItem is an element of the array stored in the top-level manifest.json file.
type ManifestItem struct {
Config string Config string
RepoTags []string RepoTags []string
Layers []string Layers []string

2
vendor/github.com/containers/image/vendor.conf generated vendored
View File

@ -15,7 +15,7 @@ github.com/mattn/go-shellwords 005a0944d84452842197c2108bd9168ced206f78
github.com/mistifyio/go-zfs c0224de804d438efd11ea6e52ada8014537d6062 github.com/mistifyio/go-zfs c0224de804d438efd11ea6e52ada8014537d6062
github.com/mtrmac/gpgme b2432428689ca58c2b8e8dea9449d3295cf96fc9 github.com/mtrmac/gpgme b2432428689ca58c2b8e8dea9449d3295cf96fc9
github.com/opencontainers/go-digest aa2ec055abd10d26d539eb630a92241b781ce4bc github.com/opencontainers/go-digest aa2ec055abd10d26d539eb630a92241b781ce4bc
github.com/opencontainers/image-spec v1.0.0-rc6 github.com/opencontainers/image-spec v1.0.0
github.com/opencontainers/runc 6b1d0e76f239ffb435445e5ae316d2676c07c6e3 github.com/opencontainers/runc 6b1d0e76f239ffb435445e5ae316d2676c07c6e3
github.com/pborman/uuid 1b00554d822231195d1babd97ff4a781231955c9 github.com/pborman/uuid 1b00554d822231195d1babd97ff4a781231955c9
github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302 github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302