opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 04:34:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman machine: pull wsl image from machine-os

Browse Source 
Starting with [1] we now build and publish the wsl image from the
machine-os repo, as such this special case is no longer needed.

[1] https://github.com/containers/podman-machine-os/pull/142

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-06-10 18:09:21 +02:00
parent dbebcbe619
commit 22789928d4
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/machine/ocipull/ociartifact.go
View File

@ -27,7 +27,6 @@ const (
artifactRegistry = "quay.io" artifactRegistry = "quay.io"
artifactRepo = "podman" artifactRepo = "podman"
artifactImageName = "machine-os" artifactImageName = "machine-os"
artifactImageNameWSL = "machine-os-wsl"
artifactOriginalName = "org.opencontainers.image.title" artifactOriginalName = "org.opencontainers.image.title"
machineOS = "linux" machineOS = "linux"
) )
@ -95,13 +94,7 @@ func NewOCIArtifactPull(ctx context.Context, dirs *define.MachineDirs, endpoint
cache := false cache := false
if endpoint == "" { if endpoint == "" {
// The OCI artifact containing the OS image for WSL has a different
// image name. This should be temporary and dropped as soon as the
// OS image for WSL is built from fedora-coreos too (c.f. RUN-2178).
imageName := artifactImageName imageName := artifactImageName
if vmType == define.WSLVirt {
imageName = artifactImageNameWSL
}
endpoint = fmt.Sprintf("docker://%s/%s/%s:%s", artifactRegistry, artifactRepo, imageName, artifactVersion.majorMinor()) endpoint = fmt.Sprintf("docker://%s/%s/%s:%s", artifactRegistry, artifactRepo, imageName, artifactVersion.majorMinor())
cache = true cache = true
} }