Skip to content

Commit effb2bd

Browse files
committed
builder: avoid unset credentials in containerd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
1 parent 287144d commit effb2bd

File tree

1 file changed

+4
-1
lines changed
  • builder/builder-next/adapters/containerimage

1 file changed

+4
-1
lines changed

‎builder/builder-next/adapters/containerimage/pull.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOpti
8888
func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
8989
id := session.FromContext(ctx)
9090
if id == "" {
91-
return nil
91+
// can be removed after containerd/containerd#2812
92+
return func(string) (string, string, error) {
93+
return "", "", nil
94+
}
9295
}
9396
return func(host string) (string, string, error) {
9497
timeoutCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)

0 commit comments

Comments
 (0)