Merge pull request #3294 from dmcgowan/fix-metadata-panic

estesp · web-flow · commit 2088fc999c20 · 2019-05-22T00:49:40.000+02:00
Ensure namespaced writer commit has correct namespace
diff --git a/metadata/content.go b/metadata/content.go
@@ -567,6 +567,8 @@ func (nw *namespacedWriter) createAndCopy(ctx context.Context, desc ocispec.Desc
 }
 
 func (nw *namespacedWriter) Commit(ctx context.Context, size int64, expected digest.Digest, opts ...content.Opt) error {
+	ctx = namespaces.WithNamespace(ctx, nw.namespace)
+
 	nw.l.RLock()
 	defer nw.l.RUnlock()
 

Original file line number	Diff line number	Diff line change
`@@ -567,6 +567,8 @@ func (nw *namespacedWriter) createAndCopy(ctx context.Context, desc ocispec.Desc`
`567`	`567`	`}`
`568`	`568`
`569`	`569`	`func (nw *namespacedWriter) Commit(ctx context.Context, size int64, expected digest.Digest, opts ...content.Opt) error {`
	`570`	`+ ctx = namespaces.WithNamespace(ctx, nw.namespace)`
	`571`	`+`
`570`	`572`	`nw.l.RLock()`
`571`	`573`	`defer nw.l.RUnlock()`
`572`	`574`