summaryrefslogtreecommitdiff
path: root/libpod/image/pull.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-25 10:43:00 -0700
committerGitHub <noreply@github.com>2021-03-25 10:43:00 -0700
commitd64ebc5369192253a76d6463a95a697c481fd9aa (patch)
tree04e6dde22cd2ad3868774ee669cd17cfc3100c6c /libpod/image/pull.go
parent896ea085b1524750ce5ac4599dc3e2fd2972048c (diff)
parent2a66ef333affa84932ae7b9d3377b622d9f75e55 (diff)
downloadpodman-d64ebc5369192253a76d6463a95a697c481fd9aa.tar.gz
podman-d64ebc5369192253a76d6463a95a697c481fd9aa.tar.bz2
podman-d64ebc5369192253a76d6463a95a697c481fd9aa.zip
Merge pull request #9817 from vrothberg/image-unit-aliases
image unit tests - make them pass on F34 with enforced short-name mode
Diffstat (limited to 'libpod/image/pull.go')
-rw-r--r--libpod/image/pull.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index 58160b52f..6517fbd07 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -245,6 +245,7 @@ func (ir *Runtime) pullImageFromHeuristicSource(ctx context.Context, inputName s
sc.OSChoice = dockerOptions.OSChoice
sc.ArchitectureChoice = dockerOptions.ArchitectureChoice
sc.VariantChoice = dockerOptions.VariantChoice
+ sc.SystemRegistriesConfPath = dockerOptions.RegistriesConfPath
}
if signaturePolicyPath == "" {
sc.SignaturePolicyPath = ir.SignaturePolicyPath
@@ -306,7 +307,12 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa
}
}()
- systemRegistriesConfPath := registries.SystemRegistriesConfPath()
+ var systemRegistriesConfPath string
+ if dockerOptions != nil && dockerOptions.RegistriesConfPath != "" {
+ systemRegistriesConfPath = dockerOptions.RegistriesConfPath
+ } else {
+ systemRegistriesConfPath = registries.SystemRegistriesConfPath()
+ }
var (
images []string