Merge pull request #4941 from zhsj/cherry-pick-4855

mxpv · web-flow · commit 86f5704c6941 · 2021-01-14T10:35:43.000-08:00
[release/v1.4] docker: avoid concurrent map access panic
diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
@@ -525,7 +525,10 @@ func (r *request) do(ctx context.Context) (*http.Response, error) {
 	if err != nil {
 		return nil, err
 	}
-	req.Header = r.header
+	req.Header = http.Header{} // headers need to be copied to avoid concurrent map access
+	for k, v := range r.header {
+		req.Header[k] = v
+	}
 	if r.body != nil {
 		body, err := r.body()
 		if err != nil {
