daemon/containerd: pass custom metaHeaders to resolver
Similar to how [distribution.newRepository] in the legacy distribution code
passes the (custom) http-headers. User-Agent is always set, and can't be
overridden, so we apply it after setting the custom headers.
[distribution.newRepository]: https://github.com/moby/moby/blob/9ce272f804a9383c9aa593527d318c946bfb7b38/daemon/internal/distribution/registry.go#L74-L97
Before this patch:
docker run --rm -d --name debugger -p 127.0.0.1:5001:8080 mendhak/http-https-echo
DOCKER_CUSTOM_HEADERS=X-Meta-Hello=thaJeztah docker pull localhost:5001/myimage:latest
docker logs debugger
...
"headers": {
"host": "localhost:5001",
"user-agent": "docker/dev go/go1.24.7 git-commit/8e89fe7e8cbb3048f640846590175cbae4719b25 kernel/6.10.14-linuxkit os/linux arch/arm64 containerd-client/2.1.4+unknown storage-driver/overlayfs UpstreamClient(Docker-Client/28.3.2 \\(linux\\))",
"accept": "application/json, */*",
"accept-encoding": "zstd;q=1.0, gzip;q=0.8, deflate;q=0.5",
"baggage": "trigger=api"
},
With this patch:
docker run --rm -d --name debugger -p 127.0.0.1:5001:8080 mendhak/http-https-echo
DOCKER_CUSTOM_HEADERS=X-Meta-Hello=thaJeztah docker pull localhost:5001/myimage:latest
docker logs debugger
...
"headers": {
"host": "localhost:5001",
"user-agent": "docker/dev go/go1.24.7 git-commit/8e89fe7e8cbb3048f640846590175cbae4719b25 kernel/6.10.14-linuxkit os/linux arch/arm64 containerd-client/2.1.4+unknown storage-driver/overlayfs UpstreamClient(Docker-Client/28.3.2 \\(linux\\))",
"accept": "application/json, */*",
"accept-encoding": "zstd;q=1.0, gzip;q=0.8, deflate;q=0.5",
"baggage": "trigger=api",
"x-meta-hello": "thaJeztah"
},
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2025/09/23 16:11:30Showing 3 changed files
| ... | ... |
@@ -82,7 +82,7 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor |
| 82 | 82 |
opts = append(opts, containerd.WithPlatform(platforms.FormatAll(*platform))) |
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 |
- resolver, _ := i.newResolverFromAuthConfig(ctx, authConfig, ref) |
|
| 85 |
+ resolver, _ := i.newResolverFromAuthConfig(ctx, authConfig, ref, metaHeaders) |
|
| 86 | 86 |
opts = append(opts, containerd.WithResolver(resolver)) |
| 87 | 87 |
|
| 88 | 88 |
oldImage, err := i.resolveImage(ctx, ref.String()) |
| ... | ... |
@@ -115,7 +115,7 @@ func (i *ImageService) pushRef(ctx context.Context, targetRef reference.Named, p |
| 115 | 115 |
} |
| 116 | 116 |
|
| 117 | 117 |
store := i.content |
| 118 |
- resolver, tracker := i.newResolverFromAuthConfig(ctx, authConfig, targetRef) |
|
| 118 |
+ resolver, tracker := i.newResolverFromAuthConfig(ctx, authConfig, targetRef, metaHeaders) |
|
| 119 | 119 |
pp := pushProgress{Tracker: tracker}
|
| 120 | 120 |
jobsQueue := newJobs() |
| 121 | 121 |
finishProgress := jobsQueue.showProgress(ctx, out, combinedProgress([]progressUpdater{
|
| ... | ... |
@@ -16,11 +16,14 @@ import ( |
| 16 | 16 |
"github.com/moby/moby/v2/pkg/useragent" |
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 |
-func (i *ImageService) newResolverFromAuthConfig(ctx context.Context, authConfig *registrytypes.AuthConfig, ref reference.Named) (remotes.Resolver, docker.StatusTracker) {
|
|
| 19 |
+func (i *ImageService) newResolverFromAuthConfig(ctx context.Context, authConfig *registrytypes.AuthConfig, ref reference.Named, metaHeaders http.Header) (remotes.Resolver, docker.StatusTracker) {
|
|
| 20 | 20 |
tracker := docker.NewInMemoryTracker() |
| 21 | 21 |
|
| 22 | 22 |
hosts := hostsWrapper(i.registryHosts, authConfig, ref) |
| 23 | 23 |
headers := http.Header{}
|
| 24 |
+ if metaHeaders != nil {
|
|
| 25 |
+ headers = metaHeaders.Clone() |
|
| 26 |
+ } |
|
| 24 | 27 |
headers.Set("User-Agent", dockerversion.DockerUserAgent(ctx, useragent.VersionInfo{Name: "containerd-client", Version: version.Version}, useragent.VersionInfo{Name: "storage-driver", Version: i.snapshotter}))
|
| 25 | 28 |
|
| 26 | 29 |
return docker.NewResolver(docker.ResolverOptions{
|