Merge pull request #19 from stgraber/pr16

Remove the ubuntu: and ubuntu-daily: remotes

inc/config/default.go

@@ -14,35 +14,15 @@ var ImagesRemote = Remote{
 	Protocol: "simplestreams",
 }
 
-// UbuntuRemote is the Ubuntu image server (over simplestreams).
-var UbuntuRemote = Remote{
-	Addr:     "https://cloud-images.ubuntu.com/releases",
-	Static:   true,
-	Public:   true,
-	Protocol: "simplestreams",
-}
-
-// UbuntuDailyRemote is the Ubuntu daily image server (over simplestreams).
-var UbuntuDailyRemote = Remote{
-	Addr:     "https://cloud-images.ubuntu.com/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,
-	"ubuntu":       UbuntuRemote,
-	"ubuntu-daily": UbuntuDailyRemote,
+	"local": LocalRemote,
 }
 
 // DefaultRemotes is the list of default remotes.
 var DefaultRemotes = map[string]Remote{
-	"images":       ImagesRemote,
-	"local":        LocalRemote,
-	"ubuntu":       UbuntuRemote,
-	"ubuntu-daily": UbuntuDailyRemote,
+	"images": ImagesRemote,
+	"local":  LocalRemote,
 }
 
 // DefaultConfig returns the default configuration.

inc/init.go

@@ -38,9 +38,9 @@ func (c *cmdInit) Command() *cobra.Command {
 	cmd.Use = usage("init", i18n.G("[<remote>:]<image> [<remote>:][<name>]"))
 	cmd.Short = i18n.G("Create instances from images")
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(`Create instances from images`))
-	cmd.Example = cli.FormatSection("", i18n.G(`lxc init ubuntu:22.04 u1
+	cmd.Example = cli.FormatSection("", i18n.G(`lxc init images:ubuntu/22.04 u1
 
-lxc init ubuntu:22.04 u1 < config.yaml
+lxc init images:ubuntu/22.04 u1 < config.yaml
     Create the instance with configuration from config.yaml`))
 	cmd.Hidden = true
 

inc/launch.go

@@ -24,15 +24,15 @@ func (c *cmdLaunch) Command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Create and start instances from images`))
 	cmd.Example = cli.FormatSection("", i18n.G(
-		`lxc launch ubuntu:22.04 u1
+		`lxc launch images:ubuntu/22.04 u1
 
-lxc launch ubuntu:22.04 u1 < config.yaml
+lxc launch images:ubuntu/22.04 u1 < config.yaml
     Create and start a container with configuration from config.yaml
 
-lxc launch ubuntu:22.04 u2 -t aws:t2.micro
+lxc launch images:ubuntu/22.04 u2 -t aws:t2.micro
     Create and start a container using the same size as an AWS t2.micro (1 vCPU, 1GiB of RAM)
 
-lxc launch ubuntu:22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB
+lxc launch images:ubuntu/22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB
     Create and start a virtual machine with 4 vCPUs and 4GiB of RAM`))
 	cmd.Hidden = false
 

inc/main.go

@@ -389,8 +389,8 @@ func (c *cmdGlobal) PreRun(cmd *cobra.Command, args []string) error {
 		}
 
 		if !shared.StringInSlice(cmd.Name(), []string{"init", "launch"}) {
-			fmt.Fprintf(os.Stderr, i18n.G(`To start your first container, try: lxc launch ubuntu:22.04
-Or for a virtual machine: lxc launch ubuntu:22.04 --vm`)+"\n")
+			fmt.Fprintf(os.Stderr, i18n.G(`To start your first container, try: lxc launch images:ubuntu/22.04
+Or for a virtual machine: lxc launch images:ubuntu/22.04 --vm`)+"\n")
 			flush = true
 		}
 

incus-benchmark/main.go

@@ -93,7 +93,7 @@ func main() {
 
   A CSV report can be produced to be consumed by graphing software.
 `
-	app.Example = `  # Spawn 20 Ubuntu containers in batches of 4
+	app.Example = `  # Spawn 20 containers in batches of 4
   lxd-benchmark launch --count 20 --parallel 4
 
   # Create 50 Alpine containers in batches of 10

incus-benchmark/main_init.go

@@ -26,7 +26,7 @@ func (c *cmdInit) Command() *cobra.Command {
 
 func (c *cmdInit) Run(cmd *cobra.Command, args []string) error {
 	// Choose the image
-	image := "ubuntu:"
+	image := "images:ubuntu/22.04"
 	if len(args) > 0 {
 		image = args[0]
 	}

incus-benchmark/main_launch.go

@@ -26,7 +26,7 @@ func (c *cmdLaunch) Command() *cobra.Command {
 
 func (c *cmdLaunch) Run(cmd *cobra.Command, args []string) error {
 	// Choose the image
-	image := "ubuntu:"
+	image := "images:ubuntu/22.04"
 	if len(args) > 0 {
 		image = args[0]
 	}

po/ber.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-07-28 17:56-0400\n"
+"POT-Creation-Date: 2023-08-03 22:23-0400\n"
 "PO-Revision-Date: 2022-03-10 15:10+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Berber <https://hosted.weblate.org/projects/linux-containers/"
@@ -5578,8 +5578,8 @@ msgstr ""
 
 #: inc/main.go:392
 msgid ""
-"To start your first container, try: lxc launch ubuntu:22.04\n"
-"Or for a virtual machine: lxc launch ubuntu:22.04 --vm"
+"To start your first container, try: lxc launch images:ubuntu/22.04\n"
+"Or for a virtual machine: lxc launch images:ubuntu/22.04 --vm"
 msgstr ""
 
 #: inc/config.go:293 inc/config.go:474 inc/config.go:681 inc/config.go:773
@@ -6763,24 +6763,25 @@ msgstr ""
 
 #: inc/init.go:41
 msgid ""
-"lxc init ubuntu:22.04 u1\n"
+"lxc init images:ubuntu/22.04 u1\n"
 "\n"
-"lxc init ubuntu:22.04 u1 < config.yaml\n"
+"lxc init images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: inc/launch.go:26
 msgid ""
-"lxc launch ubuntu:22.04 u1\n"
+"lxc launch images:ubuntu/22.04 u1\n"
 "\n"
-"lxc launch ubuntu:22.04 u1 < config.yaml\n"
+"lxc launch images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create and start a container with configuration from config.yaml\n"
 "\n"
-"lxc launch ubuntu:22.04 u2 -t aws:t2.micro\n"
+"lxc launch images:ubuntu/22.04 u2 -t aws:t2.micro\n"
 "    Create and start a container using the same size as an AWS t2.micro (1 "
 "vCPU, 1GiB of RAM)\n"
 "\n"
-"lxc launch ubuntu:22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB\n"
+"lxc launch images:ubuntu/22.04 v1 --vm -c limits.cpu=4 -c limits."
+"memory=4GiB\n"
 "    Create and start a virtual machine with 4 vCPUs and 4GiB of RAM"
 msgstr ""
 

po/bg.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-07-28 17:56-0400\n"
+"POT-Creation-Date: 2023-08-03 22:23-0400\n"
 "PO-Revision-Date: 2022-03-10 15:09+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/linux-"
@@ -5578,8 +5578,8 @@ msgstr ""
 
 #: inc/main.go:392
 msgid ""
-"To start your first container, try: lxc launch ubuntu:22.04\n"
-"Or for a virtual machine: lxc launch ubuntu:22.04 --vm"
+"To start your first container, try: lxc launch images:ubuntu/22.04\n"
+"Or for a virtual machine: lxc launch images:ubuntu/22.04 --vm"
 msgstr ""
 
 #: inc/config.go:293 inc/config.go:474 inc/config.go:681 inc/config.go:773
@@ -6763,24 +6763,25 @@ msgstr ""
 
 #: inc/init.go:41
 msgid ""
-"lxc init ubuntu:22.04 u1\n"
+"lxc init images:ubuntu/22.04 u1\n"
 "\n"
-"lxc init ubuntu:22.04 u1 < config.yaml\n"
+"lxc init images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: inc/launch.go:26
 msgid ""
-"lxc launch ubuntu:22.04 u1\n"
+"lxc launch images:ubuntu/22.04 u1\n"
 "\n"
-"lxc launch ubuntu:22.04 u1 < config.yaml\n"
+"lxc launch images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create and start a container with configuration from config.yaml\n"
 "\n"
-"lxc launch ubuntu:22.04 u2 -t aws:t2.micro\n"
+"lxc launch images:ubuntu/22.04 u2 -t aws:t2.micro\n"
 "    Create and start a container using the same size as an AWS t2.micro (1 "
 "vCPU, 1GiB of RAM)\n"
 "\n"
-"lxc launch ubuntu:22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB\n"
+"lxc launch images:ubuntu/22.04 v1 --vm -c limits.cpu=4 -c limits."
+"memory=4GiB\n"
 "    Create and start a virtual machine with 4 vCPUs and 4GiB of RAM"
 msgstr ""
 

po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-07-28 17:56-0400\n"
+"POT-Creation-Date: 2023-08-03 22:23-0400\n"
 "PO-Revision-Date: 2022-03-10 15:10+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/linux-containers/"
@@ -5578,8 +5578,8 @@ msgstr ""
 
 #: inc/main.go:392
 msgid ""
-"To start your first container, try: lxc launch ubuntu:22.04\n"
-"Or for a virtual machine: lxc launch ubuntu:22.04 --vm"
+"To start your first container, try: lxc launch images:ubuntu/22.04\n"
+"Or for a virtual machine: lxc launch images:ubuntu/22.04 --vm"
 msgstr ""
 
 #: inc/config.go:293 inc/config.go:474 inc/config.go:681 inc/config.go:773
@@ -6763,24 +6763,25 @@ msgstr ""
 
 #: inc/init.go:41
 msgid ""
-"lxc init ubuntu:22.04 u1\n"
+"lxc init images:ubuntu/22.04 u1\n"
 "\n"
-"lxc init ubuntu:22.04 u1 < config.yaml\n"
+"lxc init images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: inc/launch.go:26
 msgid ""
-"lxc launch ubuntu:22.04 u1\n"
+"lxc launch images:ubuntu/22.04 u1\n"
 "\n"
-"lxc launch ubuntu:22.04 u1 < config.yaml\n"
+"lxc launch images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create and start a container with configuration from config.yaml\n"
 "\n"
-"lxc launch ubuntu:22.04 u2 -t aws:t2.micro\n"
+"lxc launch images:ubuntu/22.04 u2 -t aws:t2.micro\n"
 "    Create and start a container using the same size as an AWS t2.micro (1 "
 "vCPU, 1GiB of RAM)\n"
 "\n"
-"lxc launch ubuntu:22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB\n"
+"lxc launch images:ubuntu/22.04 v1 --vm -c limits.cpu=4 -c limits."
+"memory=4GiB\n"
 "    Create and start a virtual machine with 4 vCPUs and 4GiB of RAM"
 msgstr ""
 

po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-07-28 17:56-0400\n"
+"POT-Creation-Date: 2023-08-03 22:23-0400\n"
 "PO-Revision-Date: 2022-03-10 15:11+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/linux-containers/"
@@ -5578,8 +5578,8 @@ msgstr ""
 
 #: inc/main.go:392
 msgid ""
-"To start your first container, try: lxc launch ubuntu:22.04\n"
-"Or for a virtual machine: lxc launch ubuntu:22.04 --vm"
+"To start your first container, try: lxc launch images:ubuntu/22.04\n"
+"Or for a virtual machine: lxc launch images:ubuntu/22.04 --vm"
 msgstr ""
 
 #: inc/config.go:293 inc/config.go:474 inc/config.go:681 inc/config.go:773
@@ -6763,24 +6763,25 @@ msgstr ""
 
 #: inc/init.go:41
 msgid ""
-"lxc init ubuntu:22.04 u1\n"
+"lxc init images:ubuntu/22.04 u1\n"
 "\n"
-"lxc init ubuntu:22.04 u1 < config.yaml\n"
+"lxc init images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: inc/launch.go:26
 msgid ""
-"lxc launch ubuntu:22.04 u1\n"
+"lxc launch images:ubuntu/22.04 u1\n"
 "\n"
-"lxc launch ubuntu:22.04 u1 < config.yaml\n"
+"lxc launch images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create and start a container with configuration from config.yaml\n"
 "\n"
-"lxc launch ubuntu:22.04 u2 -t aws:t2.micro\n"
+"lxc launch images:ubuntu/22.04 u2 -t aws:t2.micro\n"
 "    Create and start a container using the same size as an AWS t2.micro (1 "
 "vCPU, 1GiB of RAM)\n"
 "\n"
-"lxc launch ubuntu:22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB\n"
+"lxc launch images:ubuntu/22.04 v1 --vm -c limits.cpu=4 -c limits."
+"memory=4GiB\n"
 "    Create and start a virtual machine with 4 vCPUs and 4GiB of RAM"
 msgstr ""
 

po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2023-07-28 17:56-0400\n"
+"POT-Creation-Date: 2023-08-03 22:23-0400\n"
 "PO-Revision-Date: 2022-03-10 15:06+0000\n"
 "Last-Translator: Krombel <[email protected]>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -6191,8 +6191,8 @@ msgstr ""
 
 #: inc/main.go:392
 msgid ""
-"To start your first container, try: lxc launch ubuntu:22.04\n"
-"Or for a virtual machine: lxc launch ubuntu:22.04 --vm"
+"To start your first container, try: lxc launch images:ubuntu/22.04\n"
+"Or for a virtual machine: lxc launch images:ubuntu/22.04 --vm"
 msgstr ""
 
 #: inc/config.go:293 inc/config.go:474 inc/config.go:681 inc/config.go:773
@@ -8010,24 +8010,25 @@ msgstr ""
 
 #: inc/init.go:41
 msgid ""
-"lxc init ubuntu:22.04 u1\n"
+"lxc init images:ubuntu/22.04 u1\n"
 "\n"
-"lxc init ubuntu:22.04 u1 < config.yaml\n"
+"lxc init images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create the instance with configuration from config.yaml"
 msgstr ""
 
 #: inc/launch.go:26
 msgid ""
-"lxc launch ubuntu:22.04 u1\n"
+"lxc launch images:ubuntu/22.04 u1\n"
 "\n"
-"lxc launch ubuntu:22.04 u1 < config.yaml\n"
+"lxc launch images:ubuntu/22.04 u1 < config.yaml\n"
 "    Create and start a container with configuration from config.yaml\n"
 "\n"
-"lxc launch ubuntu:22.04 u2 -t aws:t2.micro\n"
+"lxc launch images:ubuntu/22.04 u2 -t aws:t2.micro\n"
 "    Create and start a container using the same size as an AWS t2.micro (1 "
 "vCPU, 1GiB of RAM)\n"
 "\n"
-"lxc launch ubuntu:22.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB\n"
+"lxc launch images:ubuntu/22.04 v1 --vm -c limits.cpu=4 -c limits."
+"memory=4GiB\n"
 "    Create and start a virtual machine with 4 vCPUs and 4GiB of RAM"
 msgstr ""