Skip to content
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

Jump to bottom

allow remote.DefaultTransport to be overridden by an http.RoundTripper #1449

Merged
merged 2 commits into from Sep 20, 2022
Merged

allow remote.DefaultTransport to be overridden by an http.RoundTripper #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d77ed
allow remote.DefaultTransport to be overridden by an http.RoundTripper
imjasonh Sep 19, 2022
92c6ae1
lint finding
imjasonh Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions cmd/crane/cmd/root.go
View file
Open in desktop
Expand Up @@ -70,12 +70,16 @@ func New(use, short string, options []crane.Option) *cobra.Command {

options = append(options, crane.WithPlatform(platform.platform))

transport := remote.DefaultTransport.Clone()
transport.TLSClientConfig = &tls.Config{
InsecureSkipVerify: insecure, //nolint: gosec
rt := remote.DefaultTransport
if t, ok := remote.DefaultTransport.(interface {
Clone() *http.Transport
}); ok {
t := t.Clone()
t.TLSClientConfig = &tls.Config{
InsecureSkipVerify: insecure, //nolint: gosec
}
}

var rt http.RoundTripper = transport
// Add any http headers if they are set in the config file.
cf, err := config.Load(os.Getenv("DOCKER_CONFIG"))
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/v1/remote/options.go
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ const (

// DefaultTransport is based on http.DefaultTransport with modifications
// documented inline below.
var DefaultTransport = &http.Transport{
var DefaultTransport http.RoundTripper = &http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: (&net.Dialer{
// By default we wrap the transport in retries, so reduce the
Expand Down