From bf323c5bdd5c9bdd2f957e03c4cdaa43e4c1c5a6 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Tue, 15 Dec 2020 17:35:44 -0800
Subject: [PATCH] docker: avoid concurrent map access panic

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 remotes/docker/resolver.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go
index 5258d7179..2188ae383 100644
--- a/remotes/docker/resolver.go
+++ b/remotes/docker/resolver.go
@@ -521,7 +521,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 {