mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-10-12 08:57:42 +00:00
Merge pull request #11700 from ashley-cui/3.4stream
[3.4] Fix machine image
This commit is contained in:
commit
20587dfb7d
3 changed files with 4 additions and 2 deletions
|
|
@ -40,7 +40,7 @@ do these things manually or handle otherwise.
|
|||
#### **--image-path**
|
||||
|
||||
Fully qualified path or URL to the VM image.
|
||||
Can also be set to `testing` or `stable` to pull down default image.
|
||||
Can also be set to `testing`, `next`, or `stable` to pull down default image.
|
||||
Defaults to `testing`.
|
||||
|
||||
#### **--memory**, **-m**=*number*
|
||||
|
|
|
|||
|
|
@ -139,6 +139,8 @@ func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) {
|
|||
)
|
||||
switch imageStream {
|
||||
case "testing", "":
|
||||
streamType = fedoracoreos.StreamTesting
|
||||
case "next":
|
||||
streamType = fedoracoreos.StreamNext
|
||||
case "stable":
|
||||
streamType = fedoracoreos.StreamStable
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
|
|||
v.IdentityPath = filepath.Join(sshDir, v.Name)
|
||||
|
||||
switch opts.ImagePath {
|
||||
case "testing", "stable", "":
|
||||
case "testing", "next", "stable", "":
|
||||
// Get image as usual
|
||||
dd, err := machine.NewFcosDownloader(vmtype, v.Name, opts.ImagePath)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue