diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-27 13:13:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 13:13:42 +0200 |
| commit | 56b2937f87bd67b46aa93109aefc08ce0edb5cf1 (patch) | |
| tree | c6c4d1c885988725fc2b4459b817b88109e95e64 /pkg/domain | |
| parent | ddfa087d002a7acf1fb34388e8cec17a2c9efae6 (diff) | |
| parent | 3cc17393734a54320968b3cc46cad83f17111492 (diff) | |
| download | podman-56b2937f87bd67b46aa93109aefc08ce0edb5cf1.tar.gz podman-56b2937f87bd67b46aa93109aefc08ce0edb5cf1.tar.bz2 podman-56b2937f87bd67b46aa93109aefc08ce0edb5cf1.zip | |
Merge pull request #13653 from jmontleon/fix-manifest-push-header
Resolves #13629 Add RegistryAuthHeader to manifest push
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/tunnel/manifest.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go index d2efed8d3..9ac3fdb83 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -50,6 +50,7 @@ func (ir *ImageEngine) ManifestInspect(_ context.Context, name string) ([]byte, func (ir *ImageEngine) ManifestAdd(_ context.Context, name string, imageNames []string, opts entities.ManifestAddOptions) (string, error) { options := new(manifests.AddOptions).WithAll(opts.All).WithArch(opts.Arch).WithVariant(opts.Variant) options.WithFeatures(opts.Features).WithImages(imageNames).WithOS(opts.OS).WithOSVersion(opts.OSVersion) + options.WithUsername(opts.Username).WithPassword(opts.Password).WithAuthfile(opts.Authfile) if len(opts.Annotation) != 0 { annotations := make(map[string]string) for _, annotationSpec := range opts.Annotation { @@ -61,6 +62,13 @@ func (ir *ImageEngine) ManifestAdd(_ context.Context, name string, imageNames [] } options.WithAnnotation(annotations) } + if s := opts.SkipTLSVerify; s != types.OptionalBoolUndefined { + if s == types.OptionalBoolTrue { + options.WithSkipTLSVerify(true) + } else { + options.WithSkipTLSVerify(false) + } + } id, err := manifests.Add(ir.ClientCtx, name, options) if err != nil { |