Skip to content

Add defaults for machine-image #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −11
Open

Add defaults for machine-image #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/docs/containers.conf.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ Number of CPU's a machine is created with.

The size of the disk in GB created when init-ing a podman-machine VM

**image**=""
**image**="docker://quay.io/podman/machine-os"

Image used when creating a new VM using `podman machine init`.
Can be specified as a registry with a bootable OCI artifact, download URL, or a local path.
Expand Down
2 changes: 1 addition & 1 deletion common/pkg/config/config_local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ var _ = Describe("Config Local", func() {
// Given
config, err := newLocked(&Options{}, &paths{})
gomega.Expect(err).ToNot(gomega.HaveOccurred())
gomega.Expect(config.Machine.Image).To(gomega.Equal(""))
gomega.Expect(config.Machine.Image).To(gomega.Equal("docker://quay.io/podman/machine-os"))
// When
config2, err := newLocked(&Options{}, &paths{etc: "testdata/containers_default.conf"})
// Then
Expand Down
2 changes: 1 addition & 1 deletion common/pkg/config/containers.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ default_sysctls = [
# "https://example.com/linux/amd64/foobar.ami" on a Linux AMD machine.
# If unspecified, the default Podman machine image will be used.
#
#image = ""
#image = "docker://quay.io/podman/machine-os"

# Memory in MB a machine is created with.
#
Expand Down
13 changes: 5 additions & 8 deletions common/pkg/config/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,14 +305,11 @@ func defaultMachineConfig() MachineConfig {
return MachineConfig{
CPUs: uint64(cpus),
DiskSize: 100,
// TODO: Set machine image default here
// Currently the default is set in Podman as we need time to stabilize
// VM images and locations between different providers.
Image: "",
Memory: 2048,
User: getDefaultMachineUser(),
Volumes: attributedstring.NewSlice(getDefaultMachineVolumes()),
Rosetta: true,
Image: "docker://quay.io/podman/machine-os",
Memory: 2048,
User: getDefaultMachineUser(),
Volumes: attributedstring.NewSlice(getDefaultMachineVolumes()),
Rosetta: true,
}
}

Expand Down
Loading