opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 09:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7436 from rhatdan/variant

Browse Source 
Add support for image pull overrides
This commit is contained in:
OpenShift Merge Robot
2020-08-28 16:02:56 -04:00
committed by GitHub
parent c069e0bad9 3c6603a2f8
commit 97780a110b
16 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/handlers/libpod/images.go
View File

@ -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)

8
pkg/api/server/register_images.go
View File

@ -905,12 +905,16 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// description: "username:password for the registry"
// type: string
// - in: query
// name: overrideArch
// description: Pull image for the specified architecture.
// type: string
// - in: query
// name: overrideOS
// description: Pull image for the specified operating system.
// type: string
// - in: query
// name: overrideArch
// description: Pull image for the specified architecture.
// name: overrideVariant
// description: Pull image for the specified variant.
// type: string
// - in: query
// name: tlsVerify