Skip to content

revendor logrus and x/crypto - #572

Merged
vieux merged 1 commit into
docker:masterfrom
thaJeztah:bump-vendor-for-powerpc
Sep 29, 2017
Merged

revendor logrus and x/crypto#572
vieux merged 1 commit into
docker:masterfrom
thaJeztah:bump-vendor-for-powerpc

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Sep 29, 2017

Copy link
Copy Markdown
Member

I originally had these in #570, but didn't know if the x/crypto changes would affect the recently added docker trust commands (#472), so decided to keep it separate.

These dependencies were bumped upstream in moby/moby#34332 to address some issues with PowerPC64le

ping @riyazdf@clnperez@tophj-ibm PTAL

@thaJeztah
revendor logrus and x/crypto
e3b7700
updates to the same version as is currently used
on moby/moby; this bump contains fixes for ppc64le.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-io

codecov-io commented Sep 29, 2017•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #572 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@ Coverage Diff @@## master #572 +/- ##
==========================================
- Coverage 49.41% 49.41% -0.01% 
==========================================
Files 208 208 Lines 17164 17164 ==========================================
- Hits 8482 8481 -1 - Misses 8249 8250 +1 
Partials 433 433

@clnperez

clnperez commented Sep 29, 2017

Copy link
Copy Markdown
Contributor

thanks @thaJeztah for these bumps. i see no issues with this.

dnephin
dnephin approved these changes Sep 29, 2017
View reviewed changes

@dnephindnephin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

tophj-ibm
tophj-ibm approved these changes Sep 29, 2017
View reviewed changes

@tophj-ibmtophj-ibm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am seeing an issue where docker trust is outputting my passphrase to the terminal, but it doesn't seem to be related to this pr. I'll open an issue in notary. This LGTM

@riyazdf

riyazdf commented Sep 29, 2017

Copy link
Copy Markdown

@tophj-ibm: that's unexpected - is it the same for DOCKER_CONTENT_TRUST=1 docker push? And notary from master? We can follow up on community-slack too for more details, I'll give this a spin

riyazdf
riyazdf approved these changes Sep 29, 2017
View reviewed changes

@riyazdfriyazdf left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

this change LGTM.

@tophj-ibm and I have been working on community slack to diagnose the issue with the passphrase library in notary. It seems to be isolated to power. I'll file an issue on notary

@riyazdfriyazdf mentioned this pull request Sep 29, 2017
Closed
@thaJeztah

thaJeztah commented Sep 29, 2017

Copy link
Copy Markdown
MemberAuthor

thanks for reviewing!

@vieux

vieux commented Sep 29, 2017

Copy link
Copy Markdown
Contributor

LGTM

@vieux
vieux merged commit 00cc728 into docker:masterSep 29, 2017
@GordonTheTurtleGordonTheTurtle added this to the 17.10.0 milestone Sep 29, 2017
@thaJeztah
thaJeztah deleted the bump-vendor-for-powerpc branch September 29, 2017 21:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers
@dnephindnephindnephin approved these changes
@riyazdfriyazdfriyazdf approved these changes
@tophj-ibmtophj-ibmtophj-ibm approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

17.10.0

Development

Successfully merging this pull request may close these issues.

8 participants

@thaJeztah@codecov-io@clnperez@riyazdf@vieux@dnephin@tophj-ibm@GordonTheTurtle