Merge pull request #445 from roots/ubuntu-24-04

Ubuntu 24.04 support

Author: swalkinshaw

README.md

@@ -193,7 +193,7 @@ Current supported settings:
 | Setting | Description | Type | Default |
 | --- | --- | -- | -- |
 | `manager` | VM manager (Options: `auto` (depends on OS), `lima`)| string | "auto" |
-| `ubuntu` | Ubuntu OS version (Options: `18.04`, `20.04`, `22.04`)| string |
+| `ubuntu` | Ubuntu OS version (Options: `18.04`, `20.04`, `22.04`, `24.04`)| string |
 | `hosts_resolver` | VM hosts resolver (Options: `hosts_file`)| string |
 | `images` | Custom OS image | object | Set based on `ubuntu` version |
 

cli_config/cli_config.go

@@ -59,8 +59,8 @@ func (c *Config) LoadFile(path string) error {
 		return fmt.Errorf("%w: unsupported value for `vm.manager`. Must be one of: auto, lima", InvalidConfigErr)
 	}
 
-	if c.Vm.Ubuntu != "18.04" && c.Vm.Ubuntu != "20.04" && c.Vm.Ubuntu != "22.04" {
-		return fmt.Errorf("%w: unsupported value for `vm.ubuntu`. Must be one of: 18.04, 20.04, 22.04", InvalidConfigErr)
+	if c.Vm.Ubuntu != "18.04" && c.Vm.Ubuntu != "20.04" && c.Vm.Ubuntu != "22.04" && c.Vm.Ubuntu != "24.04" {
+		return fmt.Errorf("%w: unsupported value for `vm.ubuntu`. Must be one of: 18.04, 20.04, 22.04, 24.04", InvalidConfigErr)
 	}
 
 	if c.Vm.HostsResolver != "hosts_file" {

pkg/lima/ubuntu.go

@@ -37,4 +37,16 @@ var UbuntuImages = map[string][]Image{
 			Arch:     "aarch64",
 		},
 	},
+	"24.04": {
+		{
+			Alias:    "noble",
+			Location: "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img",
+			Arch:     "x86_64",
+		},
+		{
+			Alias:    "noble",
+			Location: "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-arm64.img",
+			Arch:     "aarch64",
+		},
+	},
 }

trellis/trellis.go

@@ -40,7 +40,7 @@ var DefaultCliConfig = cli_config.Config{
 	Vm: cli_config.VmConfig{
 		Manager:       "auto",
 		HostsResolver: "hosts_file",
-		Ubuntu:        "22.04",
+		Ubuntu:        "24.04",
 	},
 }