summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-29 10:37:59 -0400
committerGitHub <noreply@github.com>2020-05-29 10:37:59 -0400
commit0c750a9672d8078c655fb95f379600609b36dad4 (patch)
tree8ca8f81cdf302b1905d7a56f7c5c76ba5468c6f1 /libpod/runtime.go
parent78c38460eb8ba9190d414f2da6a1414990cc6cfd (diff)
parentdc80267b594e41cf7e223821dc1446683f0cae36 (diff)
downloadpodman-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/runtime.go')
-rw-r--r--libpod/runtime.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index c1864683f..4744de1a2 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -339,9 +339,10 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {
}
// Set up containers/image
- runtime.imageContext = &types.SystemContext{
- SignaturePolicyPath: runtime.config.Engine.SignaturePolicyPath,
+ if runtime.imageContext == nil {
+ runtime.imageContext = &types.SystemContext{}
}
+ runtime.imageContext.SignaturePolicyPath = runtime.config.Engine.SignaturePolicyPath
// Create the tmpDir
if err := os.MkdirAll(runtime.config.Engine.TmpDir, 0751); err != nil {