Allow control over TLS version and ciphers for docker-registry #13258
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[test] |
|
Evaluated for origin test up to d2ab74c |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/873/) (Base Commit: b4652ac) |
miminar
approved these changes
Mar 7, 2017
| @@ -36,6 +36,8 @@ import ( | |||
| _ "github.com/docker/distribution/registry/storage/driver/s3-aws" | |||
| _ "github.com/docker/distribution/registry/storage/driver/swift" | |||
|
|
|||
| "strings" | |||
|
[merge] @miminar agreed the strings import is ok to fix later. |
|
Evaluated for origin merge up to d2ab74c |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/873/) (Base Commit: 11034b2) (Image: devenv-rhel7_6047) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allows envvar-based control over tls version and ciphers for docker registry via envvars
Valid tls versions are "VersionTLS10", "VersionTLS11", "VersionTLS12"
Valid cipher suites are https://golang.org/pkg/crypto/tls/#pkg-constants for the golang version used to build origin, taken from descriptions of http://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-4
I'm not sure whether we want to try to add config file options for these... the stanza for TLS options is part of docker standard config
follow up to #13167 for the docker registry