浏览代码

Merge pull request #38226 from tonistiigi/nil-credentials

builder: avoid unset credentials in containerd
Sebastiaan van Stijn 6 年之前
父节点
当前提交
e6244aa598
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      builder/builder-next/adapters/containerimage/pull.go

+ 4 - 1
builder/builder-next/adapters/containerimage/pull.go

@@ -88,7 +88,10 @@ func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOpti
 func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
 	id := session.FromContext(ctx)
 	if id == "" {
-		return nil
+		// can be removed after containerd/containerd#2812
+		return func(string) (string, string, error) {
+			return "", "", nil
+		}
 	}
 	return func(host string) (string, string, error) {
 		timeoutCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)