Update containerd and buildkit go modules (#19376)

* Update containerd and buildkit go modules

* Fix build

* Fix typecheck errors

---------

Co-authored-by: Thomas Schubart <[email protected]>

Author: aledbf

components/blobserve/go.mod

@@ -3,9 +3,9 @@ module github.com/gitpod-io/gitpod/blobserve
 go 1.21
 
 require (
-	github.com/containerd/containerd v1.7.11
-	github.com/docker/cli v24.0.5+incompatible
-	github.com/docker/distribution v2.8.2+incompatible
+	github.com/containerd/containerd v1.7.13
+	github.com/docker/cli v25.0.1+incompatible
+	github.com/docker/distribution v2.8.3+incompatible
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/registry-facade v0.0.0-00010101000000-000000000000
 	github.com/google/go-cmp v0.5.9
@@ -28,6 +28,7 @@ require (
 	github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/docker-credential-helpers v0.8.0 // indirect
 	github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect

components/blobserve/go.sum

@@ -3,9 +3,9 @@ module github.com/gitpod-io/gitpod/ide-service
 go 1.21
 
 require (
-	github.com/containerd/containerd v1.7.11
-	github.com/docker/cli v24.0.2+incompatible
-	github.com/docker/distribution v2.8.1+incompatible
+	github.com/containerd/containerd v1.7.13
+	github.com/docker/cli v25.0.1+incompatible
+	github.com/docker/distribution v2.8.3+incompatible
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/gitpod-protocol v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/ide-service-api v0.0.0-00010101000000-000000000000
@@ -29,6 +29,7 @@ require (
 	github.com/configcat/go-sdk/v7 v7.6.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/frankban/quicktest v1.11.3 // indirect

components/ide-service/go.mod

@@ -4,12 +4,12 @@ go 1.21
 
 require (
 	github.com/containerd/console v1.0.3
-	github.com/containerd/containerd v1.7.11
+	github.com/containerd/containerd v1.7.13
 	github.com/docker/cli v24.0.4+incompatible
 	github.com/docker/distribution v2.8.2+incompatible
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
 	github.com/hashicorp/go-retryablehttp v0.7.2
-	github.com/moby/buildkit v0.12.4
+	github.com/moby/buildkit v0.12.5
 	github.com/opencontainers/runtime-spec v1.1.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.6.0

components/ide-service/go.sum

@@ -4,10 +4,10 @@ go 1.21
 
 require (
 	github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc
-	github.com/containerd/containerd v1.7.11
-	github.com/docker/cli v24.0.5+incompatible
-	github.com/docker/distribution v2.8.2+incompatible
-	github.com/docker/docker v23.0.3+incompatible
+	github.com/containerd/containerd v1.7.13
+	github.com/docker/cli v25.0.1+incompatible
+	github.com/docker/distribution v2.8.3+incompatible
+	github.com/docker/docker v25.0.1+incompatible
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
@@ -96,6 +96,7 @@ require (
 require (
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/containerd/log v0.1.0 // indirect
+	github.com/distribution/reference v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect

components/image-builder-bob/go.mod

@@ -18,9 +18,9 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ecr"
+	"github.com/distribution/reference"
 	"github.com/docker/cli/cli/config/configfile"
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/registry"
 	"golang.org/x/xerrors"
 
 	"github.com/gitpod-io/gitpod/common-go/log"
@@ -206,7 +206,7 @@ func (ath *ECRAuthenticator) Authenticate(ctx context.Context, registry string)
 }
 
 // Authentication represents docker usable authentication
-type Authentication types.AuthConfig
+type Authentication registry.AuthConfig
 
 func (a *Authentication) Empty() bool {
 	if a == nil {
@@ -388,7 +388,7 @@ func (a AllowedAuthFor) additionalAuth(domain string) *Authentication {
 }
 
 // ImageBuildAuth is the format image builds needs
-type ImageBuildAuth map[string]types.AuthConfig
+type ImageBuildAuth map[string]registry.AuthConfig
 
 // GetImageBuildAuthFor produces authentication in the format an image builds needs
 func (a AllowedAuthFor) GetImageBuildAuthFor(ctx context.Context, auth RegistryAuthenticator, additionalRegistries []string, blocklist []string) (res ImageBuildAuth) {
@@ -405,7 +405,7 @@ func (a AllowedAuthFor) GetImageBuildAuthFor(ctx context.Context, auth RegistryA
 			continue
 		}
 		ath := a.additionalAuth(reg)
-		res[reg] = types.AuthConfig(*ath)
+		res[reg] = registry.AuthConfig(*ath)
 	}
 	for _, reg := range additionalRegistries {
 		ath, err := auth.Authenticate(ctx, reg)
@@ -416,7 +416,7 @@ func (a AllowedAuthFor) GetImageBuildAuthFor(ctx context.Context, auth RegistryA
 		if ath.Empty() {
 			continue
 		}
-		res[reg] = types.AuthConfig(*ath)
+		res[reg] = registry.AuthConfig(*ath)
 	}
 
 	return

components/image-builder-bob/go.sum

@@ -4,9 +4,9 @@ go 1.21
 
 require (
 	github.com/alicebob/miniredis/v2 v2.30.4
-	github.com/containerd/containerd v1.7.11
-	github.com/docker/cli v24.0.5+incompatible
-	github.com/docker/distribution v2.8.2+incompatible
+	github.com/containerd/containerd v1.7.13
+	github.com/docker/cli v25.0.1+incompatible
+	github.com/docker/distribution v2.8.3+incompatible
 	github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
 	github.com/gitpod-io/gitpod/registry-facade/api v0.0.0-00010101000000-000000000000
 	github.com/go-redis/redismock/v9 v9.0.3
@@ -63,6 +63,7 @@ require (
 	github.com/dgraph-io/badger v1.6.2 // indirect
 	github.com/dgraph-io/ristretto v0.0.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect