mirror of
https://github.com/containers/podman.git
synced 2025-06-23 02:18:13 +08:00
podman machine: enforce a single search registry
Enforce "docker.io" to be the only search registry. Short-name resolution for remote clients is not fully supported since there is no means to prompt. Enforcing a single registry works around the problem since prompting only fires with more than one search registry. Fixes: #11489 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
@ -139,6 +139,21 @@ func getDirs(usrName string) []Directory {
|
||||
}
|
||||
dirs[i] = newDir
|
||||
}
|
||||
|
||||
// Issue #11489: make sure that we can inject a custom registries.conf
|
||||
// file on the system level to force a single search registry.
|
||||
// The remote client does not yet support prompting for short-name
|
||||
// resolution, so we enforce a single search registry (i.e., docker.io)
|
||||
// as a workaround.
|
||||
dirs = append(dirs, Directory{
|
||||
Node: Node{
|
||||
Group: getNodeGrp("root"),
|
||||
Path: "/etc/containers/registries.conf.d",
|
||||
User: getNodeUsr("root"),
|
||||
},
|
||||
DirectoryEmbedded1: DirectoryEmbedded1{Mode: intToPtr(493)},
|
||||
})
|
||||
|
||||
return dirs
|
||||
}
|
||||
|
||||
@ -203,6 +218,27 @@ func getFiles(usrName string) []File {
|
||||
Mode: intToPtr(420),
|
||||
},
|
||||
})
|
||||
|
||||
// Issue #11489: make sure that we can inject a custom registries.conf
|
||||
// file on the system level to force a single search registry.
|
||||
// The remote client does not yet support prompting for short-name
|
||||
// resolution, so we enforce a single search registry (i.e., docker.io)
|
||||
// as a workaround.
|
||||
files = append(files, File{
|
||||
Node: Node{
|
||||
Group: getNodeGrp("root"),
|
||||
Path: "/etc/containers/registries.conf.d/999-podman-machine.conf",
|
||||
User: getNodeUsr("root"),
|
||||
},
|
||||
FileEmbedded1: FileEmbedded1{
|
||||
Append: nil,
|
||||
Contents: Resource{
|
||||
Source: strToPtr("data:,unqualified-search-registries%3D%5B%22docker.io%22%5D"),
|
||||
},
|
||||
Mode: intToPtr(420),
|
||||
},
|
||||
})
|
||||
|
||||
return files
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user