Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.4] Fix manifest verification if pullthrough enabled #12396

Merged

Conversation

legionus
Copy link
Contributor

@legionus legionus commented Jan 5, 2017

@mfojtik
Copy link
Contributor

mfojtik commented Jan 5, 2017

hold on merging till the master branch PR is merged and QE test it.

@legionus legionus changed the title Fix manifest verification if pullthrough enabled [DO NOT MERGE] Fix manifest verification if pullthrough enabled Jan 5, 2017
@@ -108,8 +108,12 @@ func (h *manifestSchema1Handler) Payload() (mediaType string, payload []byte, ca
func (h *manifestSchema1Handler) Verify(ctx context.Context, skipDependencyVerification bool) error {
var errs distribution.ErrManifestVerification

// we want to verify that referenced blobs exist locally - thus using upstream repository object directly
repo := h.repo.Repository
// we want to verify that referenced blobs exist locally or accessible over
Copy link

Choose a reason for hiding this comment

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

or are accessible via

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@miminar fixed

Copy link

@miminar miminar left a comment

Choose a reason for hiding this comment

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

one nit; LGTM

@legionus legionus force-pushed the verify-pullthrough-1.4 branch from e6c0357 to 09ac7a5 Compare January 5, 2017 14:03
@mfojtik
Copy link
Contributor

mfojtik commented Jan 6, 2017

@legionus QE finished testing, no issues found. [merge]

@legionus legionus changed the title [DO NOT MERGE] Fix manifest verification if pullthrough enabled Fix manifest verification if pullthrough enabled Jan 6, 2017
@mfojtik
Copy link
Contributor

mfojtik commented Jan 6, 2017

flake: #10228

[merge]

@mfojtik mfojtik changed the title Fix manifest verification if pullthrough enabled [3.4] Fix manifest verification if pullthrough enabled Jan 6, 2017
@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 09ac7a5

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 6, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12682/) (Base Commit: 407c344) (Image: devenv-rhel7_5639)

@openshift-bot openshift-bot merged commit 12d0869 into openshift:release-1.4 Jan 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants