From 6a7b6a96f30b57a262af74aa14f52467721f3de7 Mon Sep 17 00:00:00 2001 From: Din Music Date: Mon, 4 Sep 2023 10:27:26 +0200 Subject: [PATCH 1/2] lxd/config: Add ubuntu-minimal and ubuntu-minimal-daily remotes Signed-off-by: Din Music (cherry picked from commit b365672a32e3edff0d92a39ea65b40317e230934) Signed-off-by: Simon Deziel --- lxc/config/default.go | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/lxc/config/default.go b/lxc/config/default.go index 04850dad0987..30954885597e 100644 --- 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 From b5baef76f41ca97f2000027ac91ab29845b54eab Mon Sep 17 00:00:00 2001 From: Din Music Date: Thu, 18 Jan 2024 17:15:35 +0100 Subject: [PATCH 2/2] lxd-benchmark: Use image from ubuntu remote in description Signed-off-by: Din Music (cherry picked from commit 413b8c5fbbedf9d6ce58d94b304bcc9623b4d8ec) Signed-off-by: Simon Deziel --- lxd-benchmark/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lxd-benchmark/main.go b/lxd-benchmark/main.go index b8aa1573ff34..16ff0ab651ca 100644 --- 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`