Merge pull request #13668 from simondeziel/minimal-remotes-stable-4.0

Add minimal remotes (stable-4.0)
canonical · Jun 26, 2024 · afd5e64 · afd5e64
2 parents 3fe463d + b5baef7
commit afd5e64
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/lxc/config/default.go b/lxc/config/default.go
@@ -30,20 +30,40 @@ var UbuntuDailyRemote = Remote{
 	Protocol: "simplestreams",
 }
 
+// UbuntuMinimalRemote is the Ubuntu minimal image server (over simplestreams).
+var UbuntuMinimalRemote = Remote{
+	Addr:     "https://cloud-images.ubuntu.com/minimal/releases/",
+	Static:   true,
+	Public:   true,
+	Protocol: "simplestreams",
+}
+
+// UbuntuMinimalDailyRemote is the Ubuntu daily minimal image server (over simplestreams).
+var UbuntuMinimalDailyRemote = Remote{
+	Addr:     "https://cloud-images.ubuntu.com/minimal/daily/",
+	Static:   true,
+	Public:   true,
+	Protocol: "simplestreams",
+}
+
 // StaticRemotes is the list of remotes which can't be removed
 var StaticRemotes = map[string]Remote{
-	"local":        LocalRemote,
-	"images":       ImagesRemote,
-	"ubuntu":       UbuntuRemote,
-	"ubuntu-daily": UbuntuDailyRemote,
+	"images":               ImagesRemote,
+	"local":                LocalRemote,
+	"ubuntu":               UbuntuRemote,
+	"ubuntu-daily":         UbuntuDailyRemote,
+	"ubuntu-minimal":       UbuntuMinimalRemote,
+	"ubuntu-minimal-daily": UbuntuMinimalDailyRemote,
 }
 
 // DefaultRemotes is the list of default remotes
 var DefaultRemotes = map[string]Remote{
-	"local":        LocalRemote,
-	"images":       ImagesRemote,
-	"ubuntu":       UbuntuRemote,
-	"ubuntu-daily": UbuntuDailyRemote,
+	"images":               ImagesRemote,
+	"local":                LocalRemote,
+	"ubuntu":               UbuntuRemote,
+	"ubuntu-daily":         UbuntuDailyRemote,
+	"ubuntu-minimal":       UbuntuMinimalRemote,
+	"ubuntu-minimal-daily": UbuntuMinimalDailyRemote,
 }
 
 // DefaultConfig is the default configuration

diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go
@@ -88,8 +88,8 @@ func main() {
 	app.Example = `  # Spawn 20 Ubuntu containers in batches of 4
   lxd-benchmark launch --count 20 --parallel 4
 
-  # Create 50 Alpine containers in batches of 10
-  lxd-benchmark init --count 50 --parallel 10 images:alpine/edge
+  # Create 50 Ubuntu Minimal 22.04 containers in batches of 10
+  lxd-benchmark init --count 50 --parallel 10 ubuntu-minimal:22.04
 
   # Delete all test containers using dynamic batch size
   lxd-benchmark delete`