diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-29 10:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 10:37:59 -0400 |
| commit | 0c750a9672d8078c655fb95f379600609b36dad4 (patch) | |
| tree | 8ca8f81cdf302b1905d7a56f7c5c76ba5468c6f1 /pkg/domain/infra/runtime_libpod.go | |
| parent | 78c38460eb8ba9190d414f2da6a1414990cc6cfd (diff) | |
| parent | dc80267b594e41cf7e223821dc1446683f0cae36 (diff) | |
| download | podman-0c750a9672d8078c655fb95f379600609b36dad4.tar.gz podman-0c750a9672d8078c655fb95f379600609b36dad4.tar.bz2 podman-0c750a9672d8078c655fb95f379600609b36dad4.zip | |
Merge pull request #6207 from vrothberg/auth-header
add X-Registry-Auth header support
Diffstat (limited to 'pkg/domain/infra/runtime_libpod.go')
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 7c9180d43..a57eadc63 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -213,6 +213,9 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo if fs.Changed("hooks-dir") { options = append(options, libpod.WithHooksDir(cfg.Engine.HooksDir...)) } + if fs.Changed("registries-conf") { + options = append(options, libpod.WithRegistriesConf(cfg.RegistriesConf)) + } // TODO flag to set CNI plugins dir? |