opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-02 23:39:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21602 from baude/ociartdisk

Browse Source 
Allow podman machine to download from oci registry
This commit is contained in:
openshift-merge-bot[bot]
2024-02-13 12:51:28 +00:00
committed by GitHub
parent 9bf3cf6584 2430fc71a0
commit c88c689584
12 changed files with 471 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/machine/shim/diskpull/diskpull.go
View File

@ -16,7 +16,7 @@ func GetDisk(userInputPath string, dirs *define.MachineDirs, imagePath *define.V
)
if userInputPath == "" {
mydisk, err = ocipull.NewVersioned(context.Background(), dirs.DataDir, name, vmType.String(), imagePath)
mydisk, err = ocipull.NewOCIArtifactPull(context.Background(), dirs, name, vmType, imagePath)
} else {
if strings.HasPrefix(userInputPath, "http") {
// TODO probably should use tempdir instead of datadir

4
pkg/machine/shim/host.go
View File

@ -135,9 +135,7 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) (*vmconfigs.M
// "/path
// "docker://quay.io/something/someManifest
// TODO Ideally this changes into some way better ...
err = mp.GetDisk(opts.ImagePath, dirs, mc)
if err != nil {
if err := mp.GetDisk(opts.ImagePath, dirs, mc); err != nil {
return nil, err
}