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

Windows: skip permissions check on key #1968

Merged
merged 1 commit into from
Jul 5, 2019

Conversation

thaJeztah
Copy link
Member

fixes #1696

This code was attempting to check Linux file permissions to determine if the key was accessible by other users, which doesn't work, and therefore prevented users on Windows to load keys.

Skipping this check on Windows (correspinding tests were already skipped).

- Description for the changelog

* Fix docker refusing to load key from delegation.key on Windows

- A picture of a cute animal (not mandatory but encouraged)

This code was attempting to check Linux file permissions
to determine if the key was accessible by other users, which
doesn't work, and therefore prevented users on Windows
to load keys.

Skipping this check on Windows (correspinding tests
were already skipped).

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

ping @justincormack @riyazdf ptal

@codecov-io
Copy link

Codecov Report

Merging #1968 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #1968      +/-   ##
==========================================
+ Coverage   56.72%   56.73%   +<.01%     
==========================================
  Files         310      310              
  Lines       21800    21801       +1     
==========================================
+ Hits        12367    12368       +1     
  Misses       8518     8518              
  Partials      915      915

1 similar comment
@codecov-io
Copy link

Codecov Report

Merging #1968 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #1968      +/-   ##
==========================================
+ Coverage   56.72%   56.73%   +<.01%     
==========================================
  Files         310      310              
  Lines       21800    21801       +1     
==========================================
+ Hits        12367    12368       +1     
  Misses       8518     8518              
  Partials      915      915

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

ping @vdemeester ptal

Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🍷

@vdemeester vdemeester merged commit c9db0fe into docker:master Jul 5, 2019
@GordonTheTurtle GordonTheTurtle added this to the 19.09.0 milestone Jul 5, 2019
@thaJeztah thaJeztah deleted the skip_windows_permissions_check branch July 5, 2019 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants