diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-28 16:02:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:02:56 -0400 |
| commit | 97780a110b58a3bcc983bff75f3665768271631c (patch) | |
| tree | ba803042c50a294dd6bc1d6f3d75f1a2be5619a5 /libpod/image | |
| parent | c069e0bad9f4aa8da98c46d702f450ce41da6346 (diff) | |
| parent | 3c6603a2f88ab5ba38bf58334417aaa90c458c06 (diff) | |
| download | podman-97780a110b58a3bcc983bff75f3665768271631c.tar.gz podman-97780a110b58a3bcc983bff75f3665768271631c.tar.bz2 podman-97780a110b58a3bcc983bff75f3665768271631c.zip | |
Merge pull request #7436 from rhatdan/variant
Add support for image pull overrides
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/docker_registry_options.go | 3 | ||||
| -rw-r--r-- | libpod/image/pull.go | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go index c434f0259..257b7ae8d 100644 --- a/libpod/image/docker_registry_options.go +++ b/libpod/image/docker_registry_options.go @@ -30,6 +30,8 @@ type DockerRegistryOptions struct { OSChoice string // If not "", overrides the use of platform.GOARCH when choosing an image or verifying architecture match. ArchitectureChoice string + // If not "", overrides_VARIANT_ instead of the running architecture variant for choosing images. + VariantChoice string // RegistriesConfPath can be used to override the default path of registries.conf. RegistriesConfPath string } @@ -43,6 +45,7 @@ func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, add DockerArchiveAdditionalTags: additionalDockerArchiveTags, OSChoice: o.OSChoice, ArchitectureChoice: o.ArchitectureChoice, + VariantChoice: o.VariantChoice, BigFilesTemporaryDir: parse.GetTempDir(), } if parent != nil { diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 641698d03..bdcda4016 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -228,6 +228,7 @@ func (ir *Runtime) pullImageFromHeuristicSource(ctx context.Context, inputName s if dockerOptions != nil { sc.OSChoice = dockerOptions.OSChoice sc.ArchitectureChoice = dockerOptions.ArchitectureChoice + sc.VariantChoice = dockerOptions.VariantChoice } sc.BlobInfoCacheDir = filepath.Join(ir.store.GraphRoot(), "cache") srcRef, err := alltransports.ParseImageName(inputName) @@ -260,6 +261,7 @@ func (ir *Runtime) pullImageFromReference(ctx context.Context, srcRef types.Imag if dockerOptions != nil { sc.OSChoice = dockerOptions.OSChoice sc.ArchitectureChoice = dockerOptions.ArchitectureChoice + sc.VariantChoice = dockerOptions.VariantChoice } goal, err := ir.pullGoalFromImageReference(ctx, srcRef, transports.ImageName(srcRef), sc) if err != nil { |