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 /libpod/options.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 'libpod/options.go')
-rw-r--r-- | libpod/options.go | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/libpod/options.go b/libpod/options.go index ff5e29335..8e0d3df86 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -8,6 +8,7 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" + "github.com/containers/image/v5/types" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/events" "github.com/containers/libpod/pkg/namespaces" @@ -17,6 +18,7 @@ import ( "github.com/containers/storage/pkg/idtools" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) // Runtime Creation Options @@ -244,6 +246,22 @@ func WithStaticDir(dir string) RuntimeOption { } } +// WithRegistriesConf configures the runtime to always use specified +// registries.conf for image processing. +func WithRegistriesConf(path string) RuntimeOption { + logrus.Debugf("Setting custom registries.conf: %q", path) + return func(rt *Runtime) error { + if _, err := os.Stat(path); err != nil { + return errors.Wrap(err, "error locating specified registries.conf") + } + if rt.imageContext == nil { + rt.imageContext = &types.SystemContext{} + } + rt.imageContext.SystemRegistriesConfPath = path + return nil + } +} + // WithHooksDir sets the directories to look for OCI runtime hook configuration. func WithHooksDir(hooksDirs ...string) RuntimeOption { return func(rt *Runtime) error { |