diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-03-24 13:10:51 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-03-25 16:20:35 +0100 |
| commit | 2a66ef333affa84932ae7b9d3377b622d9f75e55 (patch) | |
| tree | 04e6dde22cd2ad3868774ee669cd17cfc3100c6c /libpod/image/pull.go | |
| parent | 7fe40cd20357f04076826c64c1860a17661f0a57 (diff) | |
| download | podman-2a66ef333affa84932ae7b9d3377b622d9f75e55.tar.gz podman-2a66ef333affa84932ae7b9d3377b622d9f75e55.tar.bz2 podman-2a66ef333affa84932ae7b9d3377b622d9f75e55.zip | |
libpod/image: unit tests: use a `registries.conf` for aliases
Since some unit tests use "busybox", we need to point it to some alias
if we want it to pass CI on F34 where we're running in enforced mode.
Furthermore, make sure that the registries.conf can actually be
overridden in the code.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/image/pull.go')
| -rw-r--r-- | libpod/image/pull.go | 8 |
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 |