Skip to content

Commit

Permalink
Replace old links (stable-5.0) (#14202)
Browse files Browse the repository at this point in the history
Fixes #13181
  • Loading branch information
tomponline authored Oct 4, 2024
2 parents 143d3ec + 4f396f0 commit 24f7b44
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 521 deletions.
2 changes: 1 addition & 1 deletion doc/.sphinx/_templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{# ru-fu: replaced RTD icons with our links #}

<div class="ask-discourse">
<a class="muted-link" href="https://discuss.linuxcontainers.org/">Ask a question</a>
<a class="muted-link" href="https://discourse.ubuntu.com/c/lxd/126">Ask a question</a>
</div>

{% if github_url and github_version and github_folder and github_filetype %}
Expand Down
6 changes: 4 additions & 2 deletions doc/cloud-init.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ The `cloud-init` actions are run only once on the first start of the instance.
Rebooting the instance does not re-trigger the actions.
```

(cloud-init-support)=
## `cloud-init` support in images

To use `cloud-init`, you must base your instance on an image that has `cloud-init` installed:

* All images from the `ubuntu` and `ubuntu-daily` {ref}`image servers <remote-image-servers>` have `cloud-init` support.
* Images from the [`images` remote](https://images.linuxcontainers.org/) have `cloud-init`-enabled variants, which are usually bigger in size than the default variant.
The cloud variants use the `/cloud` suffix, for example, `images:ubuntu/22.04/cloud`.
However, images for Ubuntu releases prior to `20.04` require special handling to integrate properly with `cloud-init`, so that `lxc exec` works correctly with virtual machines that use those images.
* Images from the [`images` remote](https://images.lxd.canonical.com/) have `cloud-init`-enabled variants, which are usually bigger in size than the default variant.
The cloud variants use the `/cloud` suffix, for example, `images:alpine/edge/cloud`.

## Configuration options

Expand Down
2 changes: 1 addition & 1 deletion doc/external_resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
:maxdepth: 1
Project repository <https://github.com/canonical/lxd>
Community image server <https://images.linuxcontainers.org>
Image server <https://images.lxd.canonical.com>
```
4 changes: 2 additions & 2 deletions doc/howto/images_create.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ Usually, this includes the following data:
(images-create-build)=
## Build an image

For building your own images, you can use [`distrobuilder`](https://github.com/lxc/distrobuilder).
For building your own images, you can use [LXD image builder](https://github.com/canonical/lxd-imagebuilder).

See the [`distrobuilder` documentation](https://linuxcontainers.org/distrobuilder/docs/latest/) for instructions for installing and using the tool.
See the [LXD image builder documentation](https://canonical-lxd-imagebuilder.readthedocs-hosted.com/en/latest/) for instructions for installing and using the tool.
3 changes: 2 additions & 1 deletion doc/howto/images_remote.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ To reference an image, specify its remote and its alias or fingerprint, separate
For example:

ubuntu:22.04
images:ubuntu/22.04
ubuntu-minimal:22.04
images:alpine/edge
local:ed7509d7e83f

(images-remote-default)=
Expand Down
2 changes: 1 addition & 1 deletion doc/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Complete the following steps to install the snap:

sudo snap install lxd --channel=5.0/stable

For more information about LXD snap packages (regarding more versions, update management etc.), see [Managing the LXD snap](https://discuss.linuxcontainers.org/t/managing-the-lxd-snap/8178).
For more information about LXD snap packages (regarding more versions, update management etc.), see [Managing the LXD snap](https://discourse.ubuntu.com/t/managing-the-lxd-snap-package/37214).

```{note}
On Ubuntu 18.04, if you previously had the LXD deb package installed, you can migrate all your existing data over with the following command:
Expand Down
34 changes: 31 additions & 3 deletions doc/reference/remote_image_servers.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
discourse: 16647
discourse: ubuntu:43824,16647
relatedlinks: https://www.youtube.com/watch?v=pM0EgUqj2a0
---

Expand All @@ -8,6 +8,17 @@ relatedlinks: https://www.youtube.com/watch?v=pM0EgUqj2a0

The `lxc` CLI command comes pre-configured with the following default remote image servers:

`images:`
: This server provides unofficial images for a variety of Linux distributions.
The images are built to be compact and minimal, and therefore the default image variants do not include `cloud-init`.
Where possible, `/cloud` variants that include `cloud-init` are provided.
See [`cloud-init` support in images](cloud-init-support).

This server does not provide official Ubuntu images (for those, use the `ubuntu:` server).
It does, however, provide desktop variants of current Ubuntu releases.

See [`images.lxd.canonical.com`](https://images.lxd.canonical.com) for an overview of available images.

`ubuntu:`
: This server provides official stable Ubuntu images.
All images are cloud images, which means that they include both `cloud-init` and the `lxd-agent`.
Expand All @@ -20,11 +31,28 @@ The `lxc` CLI command comes pre-configured with the following default remote ima

See [`cloud-images.ubuntu.com/daily`](https://cloud-images.ubuntu.com/daily/) for an overview of available images.

`ubuntu-minimal:`
: This server provides official Ubuntu Minimal images.
All images are cloud images, which means that they include both `cloud-init` and the `lxd-agent`.

See [`cloud-images.ubuntu.com/minimal/releases`](https://cloud-images.ubuntu.com/minimal/releases/) for an overview of available images.

`ubuntu-minimal-daily:`
: This server provides official daily Ubuntu Minimal images.
All images are cloud images, which means that they include both `cloud-init` and the `lxd-agent`.

See [`cloud-images.ubuntu.com/minimal/daily`](https://cloud-images.ubuntu.com/minimal/daily/) for an overview of available images.

`images:`
: This server provides unofficial images for a variety of Linux distributions.
The images are maintained by the [Linux Containers](https://linuxcontainers.org/) team and are built to be compact and minimal.
The images are built to be compact and minimal, and therefore the default image variants do not include `cloud-init`.
Where possible, `/cloud` variants that include `cloud-init` are provided.
See [`cloud-init` support in images](cloud-init-support).

This server does not provide official Ubuntu images (for those, use the `ubuntu:` server).
It does, however, provide desktop variants of current Ubuntu releases.

See [`images.linuxcontainers.org`](https://images.linuxcontainers.org) for an overview of available images.
See [`images.lxd.canonical.com`](https://images.lxd.canonical.com) for an overview of available images.

(remote-image-server-types)=
## Remote server types
Expand Down
70 changes: 0 additions & 70 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -8488,14 +8488,6 @@ msgstr ""
#~ msgid "For example: 'lxd-images import ubuntu --alias ubuntu'."
#~ msgstr "Zum Beispiel: 'lxd-images import ubuntu --alias ubuntu'.\n"

#, fuzzy
#~ msgid ""
#~ "If this is your first run, you will need to import images using the 'lxd-"
#~ "images' script."
#~ msgstr ""
#~ "Falls dies der erste Start ist, sollten Sie mit dem 'lxd-images' Script "
#~ "Abbilder importieren.\n"

#, fuzzy
#~ msgid ""
#~ "Create a read-only snapshot of a container.\n"
Expand All @@ -8506,68 +8498,6 @@ msgstr ""
#~ "\n"
#~ "lxc snapshot <Quelle> <Sicherungspunkt> [--stateful]\n"

#, fuzzy
#~ msgid ""
#~ "Manipulate container images.\n"
#~ "\n"
#~ "lxc image import <tarball> [rootfs tarball|URL] [target] [--public] [--"
#~ "created-at=ISO-8601] [--expires-at=ISO-8601] [--fingerprint=FINGERPRINT] "
#~ "[prop=value]\n"
#~ "\n"
#~ "lxc image copy [remote:]<image> <remote>: [--alias=ALIAS].. [--copy-"
#~ "aliases] [--public]\n"
#~ "lxc image delete [remote:]<image>\n"
#~ "lxc image export [remote:]<image>\n"
#~ "lxc image info [remote:]<image>\n"
#~ "lxc image list [remote:] [filter]\n"
#~ "lxc image show [remote:]<image>\n"
#~ "lxc image edit [remote:]<image>\n"
#~ " Edit image, either by launching external editor or reading STDIN.\n"
#~ " Example: lxc image edit <image> # launch editor\n"
#~ " cat image.yaml | lxc image edit <image> # read from image."
#~ "yml\n"
#~ "\n"
#~ "Lists the images at specified remote, or local images.\n"
#~ "Filters are not yet supported.\n"
#~ "\n"
#~ "lxc image alias create <alias> <target>\n"
#~ "lxc image alias delete <alias>\n"
#~ "lxc image alias list [remote:]\n"
#~ "\n"
#~ "Create, delete, list image aliases. Example:\n"
#~ "lxc remote add store2 images.linuxcontainers.org\n"
#~ "lxc image alias list store2:"
#~ msgstr ""
#~ "Ändere Container Abbilder\n"
#~ "\n"
#~ "lxc image import <tarball> [Ziel] [--public] [--created-at=ISO-8601] [--"
#~ "expires-at=ISO-8601] [--fingerprint=FINGERPRINT] [prop=value]\n"
#~ "\n"
#~ "lxc image copy [remote:]<Abbild> <remote>: [--alias=ALIAS].. [--copy-"
#~ "alias]\n"
#~ "lxc image delete [remote:]<Abbild>\n"
#~ "lxc image edit [remote:]<Abbild>\n"
#~ "lxc image export [remote:]<Abbild>\n"
#~ "lxc image info [remote:]<Abbild>\n"
#~ "lxc image list [remote:] [Filter]\n"
#~ "lxc image show [remote:]<Abbild>\n"
#~ "\n"
#~ "Listet die Abbilder auf der entfernten oder lokalen Instanz.\n"
#~ "Filter werden noch nicht unterstützt.\n"
#~ "\n"
#~ "lxc image alias create <alias> <Ziel>\n"
#~ "lxc image alias delete <alias>\n"
#~ "lxc remote add images images.linuxcontainers.org\n"
#~ "lxc image alias list images:\n"
#~ "erstelle, lösche und liste Abbild Aliasse\n"

#~ msgid ""
#~ "Server certificate for host %s has changed. Add correct certificate or "
#~ "remove certificate in %s"
#~ msgstr ""
#~ "Server Zertifikat für Rechner %s hat sich geändert. Fürgen Sie das "
#~ "richtige Zertifikat hinzu oder löschen Sie das Zertifikat unter %s"

#, fuzzy
#~ msgid ""
#~ "Set the current state of a resource back to its state at the time the "
Expand Down
Loading

0 comments on commit 24f7b44

Please sign in to comment.