diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2021-09-11 23:15:49 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2021-12-10 18:16:24 +0100 |
| commit | 3725a34cbf592697d5fca3089d14045c66975fda (patch) | |
| tree | dec42fad7fe2b5db96ffab3eb0bbe6e3bd3da178 /pkg/bindings/images | |
| parent | 78dd79752044d9ccc812a9ebd5a9c708302c0f26 (diff) | |
| download | podman-3725a34cbf592697d5fca3089d14045c66975fda.tar.gz podman-3725a34cbf592697d5fca3089d14045c66975fda.tar.bz2 podman-3725a34cbf592697d5fca3089d14045c66975fda.zip | |
Call MakeXRegistryAuthHeader instead of Header(..., XRegistryAuthHeader)
All callers hard-code a header value, so this is actually shorter.
Should not change behavior.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'pkg/bindings/images')
| -rw-r--r-- | pkg/bindings/images/build.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/images/images.go | 4 | ||||
| -rw-r--r-- | pkg/bindings/images/pull.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 0f73604e1..f643b3c89 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -297,7 +297,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO headers, err = auth.MakeXRegistryConfigHeader(options.SystemContext, "", "", "") } else { if options.SystemContext.DockerAuthConfig != nil { - headers, err = auth.Header(options.SystemContext, auth.XRegistryAuthHeader, options.SystemContext.AuthFilePath, options.SystemContext.DockerAuthConfig.Username, options.SystemContext.DockerAuthConfig.Password) + headers, err = auth.MakeXRegistryAuthHeader(options.SystemContext, options.SystemContext.AuthFilePath, options.SystemContext.DockerAuthConfig.Username, options.SystemContext.DockerAuthConfig.Password) } else { headers, err = auth.MakeXRegistryConfigHeader(options.SystemContext, options.SystemContext.AuthFilePath, "", "") } diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index dfb500772..74603015c 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -280,7 +280,7 @@ func Push(ctx context.Context, source string, destination string, options *PushO return err } // TODO: have a global system context we can pass around (1st argument) - header, err := auth.Header(nil, auth.XRegistryAuthHeader, options.GetAuthfile(), options.GetUsername(), options.GetPassword()) + header, err := auth.MakeXRegistryAuthHeader(nil, options.GetAuthfile(), options.GetUsername(), options.GetPassword()) if err != nil { return err } @@ -329,7 +329,7 @@ func Search(ctx context.Context, term string, options *SearchOptions) ([]entitie } // TODO: have a global system context we can pass around (1st argument) - header, err := auth.Header(nil, auth.XRegistryAuthHeader, options.GetAuthfile(), "", "") + header, err := auth.MakeXRegistryAuthHeader(nil, options.GetAuthfile(), "", "") if err != nil { return nil, err } diff --git a/pkg/bindings/images/pull.go b/pkg/bindings/images/pull.go index be21aa593..c6f20e3e1 100644 --- a/pkg/bindings/images/pull.go +++ b/pkg/bindings/images/pull.go @@ -42,7 +42,7 @@ func Pull(ctx context.Context, rawImage string, options *PullOptions) ([]string, } // TODO: have a global system context we can pass around (1st argument) - header, err := auth.Header(nil, auth.XRegistryAuthHeader, options.GetAuthfile(), options.GetUsername(), options.GetPassword()) + header, err := auth.MakeXRegistryAuthHeader(nil, options.GetAuthfile(), options.GetUsername(), options.GetPassword()) if err != nil { return nil, err } |