daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes to make layersPathSpec work 

Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>
master
Manish Tomar 2018-11-01 18:35:32 -07:00 committed by Guillaume Rose
parent fa7d949408
commit 5538da4923
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
registry/storage/paths.go
View File

@ -208,7 +208,7 @@ func pathFor(spec pathSpec) (string, error) {
return path.Join(path.Join(append(blobLinkPathComponents, components...)...), "link"), nil return path.Join(path.Join(append(blobLinkPathComponents, components...)...), "link"), nil
case layersPathSpec: case layersPathSpec:
return append(repoPrefix, v.repo, "_layers") return path.Join(append(repoPrefix, v.name, "_layers")...), nil
case blobsPathSpec: case blobsPathSpec:
blobsPathPrefix := append(rootPrefix, "blobs") blobsPathPrefix := append(rootPrefix, "blobs")
return path.Join(blobsPathPrefix...), nil return path.Join(blobsPathPrefix...), nil
@ -340,7 +340,7 @@ func (manifestTagIndexEntryLinkPathSpec) pathSpec() {}
// layersPathSpec contains the path for the layers inside a repo // layersPathSpec contains the path for the layers inside a repo
type layersPathSpec struct { type layersPathSpec struct {
repo string name string
} }
func (layersPathSpec) pathSpec() {} func (layersPathSpec) pathSpec() {}

2
registry/storage/registry.go
View File

@ -330,7 +330,7 @@ func (repo *repository) Blobs(ctx context.Context) distribution.BlobStore {
// TODO(stevvooe): linkPath limits this blob store to only layers. // TODO(stevvooe): linkPath limits this blob store to only layers.
// This instance cannot be used for manifest checks. // This instance cannot be used for manifest checks.
linkPathFns: []linkPathFunc{blobLinkPath}, linkPathFns: []linkPathFunc{blobLinkPath},
linkDirectoryPathSpec: layersPathSpec, linkDirectoryPathSpec: layersPathSpec{name: repo.name.Name()},
deleteEnabled: repo.registry.deleteEnabled, deleteEnabled: repo.registry.deleteEnabled,
resumableDigestEnabled: repo.resumableDigestEnabled, resumableDigestEnabled: repo.resumableDigestEnabled,
} }