Attachment 951910 Details for Bug 1158642 – Docker patch to handle RHEL entitlements

[patch] Docker patch to handle RHEL entitlements

docker_entitlement.patch (text/plain), 1.00 KB, created by Daniel Walsh on 2014-10-29 20:35:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Walsh

Created: 2014-10-29 20:35:13 UTC

Size: 1.00 KB

patch

obsolete

>diff --git a/registry/registry.go b/registry/registry.go
>index 7446010..c1f9bb4 100644
>--- a/registry/registry.go
>+++ b/registry/registry.go
>@@ -97,12 +97,6 @@ func doRequest(req *http.Request, jar http.CookieJar, timeout TimeoutType) (*htt
> 	if err != nil && !os.IsNotExist(err) {
> 		return nil, nil, err
> 	}
>-	entitlementDir := path.Join("/etc/pki/entitlement", req.URL.Host)
>-	if fs1, err := ioutil.ReadDir(entitlementDir); err == nil {
>-		for _, f := range fs1 {
>-			fs = append(fs, f)
>-		}
>-	}
> 
> 	var (
> 		pool  *x509.CertPool
>@@ -152,7 +146,7 @@ func doRequest(req *http.Request, jar http.CookieJar, timeout TimeoutType) (*htt
> 				if !hasFile(fs, keyName) {
> 					return nil, nil, fmt.Errorf("Missing key %s for certificate %s", keyName, certName)
> 				}
>-				cert, err := tls.LoadX509KeyPair(path.Join(entitlementDir, certName), path.Join(entitlementDir, keyName))
>+				cert, err := tls.LoadX509KeyPair(path.Join(hostDir, certName), path.Join(hostDir, keyName))
> 				if err != nil {
> 					return nil, nil, err
> 				}

Actions: View | Diff

Attachments on bug 1158642: 951910