Skip to content

Add nerdctl version to User-Agent header #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ningziwen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add nerdctl version to User-Agent header #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/imgutil/dockerconfigresolver/dockerconfigresolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ import (
"crypto/tls"
"errors"
"fmt"
"net/http"
"os"

"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker"
dockerconfig "github.com/containerd/containerd/remotes/docker/config"
containerdversion "github.com/containerd/containerd/version"
nerdctlversion "github.com/containerd/nerdctl/pkg/version"
dockercliconfig "github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/config/credentials"
dockercliconfigtypes "github.com/docker/cli/cli/config/types"
Expand All @@ -36,6 +39,8 @@ import (

var PushTracker = docker.NewInMemoryTracker()

var userAgentValue = fmt.Sprintf("nerdctl/%s containerd/%s", nerdctlversion.Version, containerdversion.Version)

type opts struct {
plainHTTP bool
skipVerifyCerts bool
Expand Down Expand Up @@ -136,6 +141,8 @@ func NewHostOptions(ctx context.Context, refHostname string, optFuncs ...Opt) (*
ho.DefaultScheme = "http"
}
}

ho.AuthorizerOpts = append(ho.AuthorizerOpts, docker.WithAuthHeader(http.Header{"User-Agent": []string{userAgentValue}}))
return &ho, nil
}

Expand All @@ -153,6 +160,7 @@ func New(ctx context.Context, refHostname string, optFuncs ...Opt) (remotes.Reso
resolverOpts := docker.ResolverOptions{
Tracker: PushTracker,
Hosts: dockerconfig.ConfigureHosts(ctx, *ho),
Headers: http.Header{"User-Agent": []string{userAgentValue}},
}

resolver := docker.NewResolver(resolverOpts)
Expand Down