Skip to content

image: slash separation between algo and hash#230

Merged
philips merged 1 commit intoopencontainers:masterfrom
runcom:colon-to-slash
Sep 1, 2016
Merged

image: slash separation between algo and hash#230
philips merged 1 commit intoopencontainers:masterfrom
runcom:colon-to-slash

Conversation

@runcom
Copy link
Member

@runcom runcom commented Aug 31, 2016

Fix up oci-image-tool to look for hashes under blobs/{algo} as per #208

This isn't addressing any language change required

$ tree 
.
├── blobs
│   └── sha256
│       ├── 086acbc3376eedf5a3d9c969a0d446e803600091f133288e8f5643a46e801976
│       ├── 98b338c114d348c417532b8a3bafd364f5d0c8f3541c01d0652e7c043d7d9056
│       └── bc6eb737e26b988486a6e8d5ac29167ae7aaaae7ba98fac406e4722a4eb219bb
├── oci-layout
└── refs
    └── latest

3 directories, 5 files

$ oci-image-tool validate --ref latest .                                                             
.: OK # nevermind here, I just noticed it and I have plan to fix this up :) net is that tests pass

Signed-off-by: Antonio Murdaca runcom@redhat.com

@runcom
Copy link
Member Author

runcom commented Aug 31, 2016 •
edited
Loading

/cc @philips @stevvooe @vbatts @s-urbaniak

@runcom runcom mentioned this pull request Aug 31, 2016
Closed
@runcom runcom force-pushed the colon-to-slash branch 2 times, most recently from 6d4674a to 6ede2f3 Compare August 31, 2016 22:35
wking
wking reviewed Aug 31, 2016
View reviewed changes
image/descriptor.go Outdated
digest, err := filepath.Rel("blobs", filepath.Clean(path))
if err != nil || d.normalizeDigest() != digest {
digest, err := filepath.Rel(filepath.Join("blobs", d.algo()), filepath.Clean(path))
if err != nil || d.hash() != digest {
Copy link
Contributor

@wking wking Aug 31, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

“Digest” is algo + hash. Can we call the digest variable filename or something to avoid confusing folks by comparing it to d.hash()?

@philips
Copy link
Contributor

philips commented Sep 1, 2016

Please fix wking's issue and then LGTM from me.

@stevvooe
Copy link
Contributor

stevvooe commented Sep 1, 2016 •
edited by caniszczyk
Loading

LGTM after merge of #232

Approved with PullApprove

@coolljt0725 coolljt0725 mentioned this pull request Sep 1, 2016
Closed
@runcom
image: slash separation between algo and hash
29650c8 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
@runcom
Copy link
Member Author

runcom commented Sep 1, 2016

@philips fixed wking's comment

@jonboulle
Copy link
Contributor

jonboulle commented Sep 1, 2016 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@philips
Copy link
Contributor

philips commented Sep 1, 2016 •
edited by caniszczyk
Loading

LGTM

Approved with PullApprove

@philips philips merged commit bc6a287 into opencontainers:master Sep 1, 2016
@runcom runcom deleted the colon-to-slash branch September 1, 2016 12:57
@wking wking mentioned this pull request Sep 2, 2016
Closed
@wking wking mentioned this pull request Sep 11, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@runcom @philips @stevvooe @jonboulle @wking