From 683bdce855a8cd8018b920fbe67bfe77c0a5f15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:23:21 -0400 Subject: [PATCH 1/5] inc: Remove Ubuntu remotes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- inc/config/default.go | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/inc/config/default.go b/inc/config/default.go index aa862740efa..5a1997325ad 100644 --- a/inc/config/default.go +++ b/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. From cf5ce8055965ed3be6ffe1bd430d6187690cdd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:23:33 -0400 Subject: [PATCH 2/5] inc: Update examples to use images:ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- inc/init.go | 4 ++-- inc/launch.go | 8 ++++---- inc/main.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inc/init.go b/inc/init.go index 678d4fd1222..b39944e18dc 100644 --- a/inc/init.go +++ b/inc/init.go @@ -38,9 +38,9 @@ func (c *cmdInit) Command() *cobra.Command { cmd.Use = usage("init", i18n.G("[:] [:][]")) 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 diff --git a/inc/launch.go b/inc/launch.go index 7ce582d1126..9178c146aa4 100644 --- a/inc/launch.go +++ b/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 diff --git a/inc/main.go b/inc/main.go index 8c396e083ff..2bb7a21e548 100644 --- a/inc/main.go +++ b/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 } From 5fc4fec122e571dc15fe89a4b5deedb45a14e836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:24:03 -0400 Subject: [PATCH 3/5] i18n: Update translation templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- po/ber.po | 19 ++++++++++--------- po/bg.po | 19 ++++++++++--------- po/ca.po | 19 ++++++++++--------- po/cs.po | 19 ++++++++++--------- po/de.po | 19 ++++++++++--------- po/el.po | 19 ++++++++++--------- po/eo.po | 19 ++++++++++--------- po/es.po | 19 ++++++++++--------- po/fa.po | 19 ++++++++++--------- po/fi.po | 19 ++++++++++--------- po/fr.po | 19 ++++++++++--------- po/he.po | 19 ++++++++++--------- po/hi.po | 19 ++++++++++--------- po/id.po | 19 ++++++++++--------- po/inc.pot | 18 +++++++++--------- po/it.po | 19 ++++++++++--------- po/ja.po | 21 ++++++++++++--------- po/ko.po | 19 ++++++++++--------- po/mr.po | 19 ++++++++++--------- po/nb_NO.po | 19 ++++++++++--------- po/nl.po | 19 ++++++++++--------- po/pa.po | 19 ++++++++++--------- po/pl.po | 19 ++++++++++--------- po/pt_BR.po | 19 ++++++++++--------- po/ru.po | 19 ++++++++++--------- po/si.po | 19 ++++++++++--------- po/sl.po | 19 ++++++++++--------- po/sr.po | 19 ++++++++++--------- po/sv.po | 19 ++++++++++--------- po/te.po | 19 ++++++++++--------- po/th.po | 19 ++++++++++--------- po/tr.po | 19 ++++++++++--------- po/tzm.po | 19 ++++++++++--------- po/ug.po | 19 ++++++++++--------- po/uk.po | 19 ++++++++++--------- po/zh_Hans.po | 19 ++++++++++--------- po/zh_Hant.po | 19 ++++++++++--------- 37 files changed, 371 insertions(+), 333 deletions(-) diff --git a/po/ber.po b/po/ber.po index 1e0b9afc837..9e9d07dfdb8 100644 --- a/po/ber.po +++ b/po/ber.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lxd\n" "Report-Msgid-Bugs-To: incus@example.net\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 \n" "Language-Team: Berber \n" "Language-Team: Bulgarian \n" "Language-Team: Catalan \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Esperanto \n" "Language-Team: Spanish \n" "Language-Team: Persian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Hebrew \n" "Language-Team: Hindi \n" "Language-Team: Indonesian \n" "Language-Team: LANGUAGE \n" @@ -5174,8 +5174,8 @@ msgid "To detach from the console, press: +a q" 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" +msgid "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 inc/copy.go:128 inc/info.go:336 inc/network.go:821 inc/storage.go:446 @@ -6291,22 +6291,22 @@ msgid "lxc info [:] [--show-log]\n" msgstr "" #: inc/init.go:41 -msgid "lxc init ubuntu:22.04 u1\n" +msgid "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" +msgid "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 "" diff --git a/po/it.po b/po/it.po index 09fc7536c3a..fdfbc5c06df 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lxd\n" "Report-Msgid-Bugs-To: incus@example.net\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:07+0000\n" "Last-Translator: Luigi Operoso \n" "Language-Team: Italian \n" "Language-Team: Japanese +a q" msgstr "コンソールから切り離すには +a q を押します" #: inc/main.go:392 +#, fuzzy 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 "" "初めてコンテナを起動するには、\"lxc launch ubuntu:22.04\" と実行してみてくだ" "さい\n" @@ -7508,10 +7509,11 @@ msgstr "" " LXD サーバの情報を表示します。" #: inc/init.go:41 +#, fuzzy 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 "" "lxc init ubuntu:22.04 u1\n" @@ -7522,16 +7524,17 @@ msgstr "" #: inc/launch.go:26 #, fuzzy 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 "" "lxc launch ubuntu:22.04 u1\n" diff --git a/po/ko.po b/po/ko.po index 0f862edeb84..bdebb68a5cb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lxd\n" "Report-Msgid-Bugs-To: incus@example.net\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 \n" "Language-Team: Korean \n" "Language-Team: Marathi \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Dutch \n" "Language-Team: Punjabi \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Brazil) \n" "Language-Team: Russian \n" "Language-Team: Sinhala \n" "Language-Team: Slovenian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Telugu \n" "Language-Team: Turkish \n" "Language-Team: Tamazight (Central Atlas) \n" "Language-Team: Uyghur \n" "Language-Team: Ukrainian \n" "Language-Team: Chinese (Simplified) \n" "Language-Team: Chinese (Traditional) Date: Thu, 3 Aug 2023 22:26:20 -0400 Subject: [PATCH 4/5] tests: Remove ubuntu remote MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- test/suites/remote.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test/suites/remote.sh b/test/suites/remote.sh index 506488a08c9..4da1738e91c 100644 --- a/test/suites/remote.sh +++ b/test/suites/remote.sh @@ -267,7 +267,6 @@ test_remote_usage() { # Ubuntu images in the results for the remote servers. if [ -z "${INCUS_OFFLINE:-}" ]; then inc_remote image list images: | grep -i -c ubuntu - inc_remote image list ubuntu: | grep -i -c ubuntu fi mv "${INCUS_CONF}/client.crt.bak" "${INCUS_CONF}/client.crt" From 3d6ca9cfdf65d757a363d4c08f3a33f30f203799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:30:55 -0400 Subject: [PATCH 5/5] incus-benchmark: Update to use images: remote MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- incus-benchmark/main.go | 2 +- incus-benchmark/main_init.go | 2 +- incus-benchmark/main_launch.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/incus-benchmark/main.go b/incus-benchmark/main.go index 46331219d16..5225a412773 100644 --- a/incus-benchmark/main.go +++ b/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 diff --git a/incus-benchmark/main_init.go b/incus-benchmark/main_init.go index 668abb52da1..ee83fa9de45 100644 --- a/incus-benchmark/main_init.go +++ b/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] } diff --git a/incus-benchmark/main_launch.go b/incus-benchmark/main_launch.go index 77d95509175..9dafffe2463 100644 --- a/incus-benchmark/main_launch.go +++ b/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] }