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 /pkg/api/handlers/libpod/images.go | |
| 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 'pkg/api/handlers/libpod/images.go')
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 51013acf1..8d3fc4e00 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -338,11 +338,12 @@ func ImagesPull(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) decoder := r.Context().Value("decoder").(*schema.Decoder) query := struct { - Reference string `schema:"reference"` - OverrideOS string `schema:"overrideOS"` - OverrideArch string `schema:"overrideArch"` - TLSVerify bool `schema:"tlsVerify"` - AllTags bool `schema:"allTags"` + Reference string `schema:"reference"` + OverrideOS string `schema:"overrideOS"` + OverrideArch string `schema:"overrideArch"` + OverrideVariant string `schema:"overrideVariant"` + TLSVerify bool `schema:"tlsVerify"` + AllTags bool `schema:"allTags"` }{ TLSVerify: true, } @@ -393,6 +394,7 @@ func ImagesPull(w http.ResponseWriter, r *http.Request) { DockerRegistryCreds: authConf, OSChoice: query.OverrideOS, ArchitectureChoice: query.OverrideArch, + VariantChoice: query.OverrideVariant, } if _, found := r.URL.Query()["tlsVerify"]; found { dockerRegistryOptions.DockerInsecureSkipTLSVerify = types.NewOptionalBool(!query.TLSVerify) |