Merge pull request #13840 from docker/master

Publish updates from master
This commit is contained in:
Sebastiaan van Stijn 2021-11-12 20:16:52 +01:00 committed by GitHub
commit 767a607e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 14 deletions

View File

@ -99,13 +99,6 @@ from the repository.
**nightly** or **test** repository, add the word `nightly` or `test` (or both) **nightly** or **test** repository, add the word `nightly` or `test` (or both)
after the word `stable` in the commands below. [Learn about **nightly** and **test** channels](index.md). after the word `stable` in the commands below. [Learn about **nightly** and **test** channels](index.md).
> **Note**: The `lsb_release -cs` sub-command below returns the name of your
> Debian distribution, such as `helium`. Sometimes, in a distribution
> like BunsenLabs Linux, you might need to change `$(lsb_release -cs)`
> to your parent Debian distribution. For example, if you are using
> `BunsenLabs Linux Helium`, you could use `stretch`. Docker does not offer any guarantees on untested
> and unsupported Debian distributions.
```console ```console
$ echo \ $ echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \

View File

@ -122,13 +122,6 @@ from the repository.
**nightly** or **test** repository, add the word `nightly` or `test` (or both) **nightly** or **test** repository, add the word `nightly` or `test` (or both)
after the word `stable` in the commands below. [Learn about **nightly** and **test** channels](index.md). after the word `stable` in the commands below. [Learn about **nightly** and **test** channels](index.md).
> **Note**: The `lsb_release -cs` sub-command below returns the name of your
> Ubuntu distribution, such as `xenial`. Sometimes, in a distribution
> like Linux Mint, you might need to change `$(lsb_release -cs)`
> to your parent Ubuntu distribution. For example, if you are using
> `Linux Mint Tessa`, you could use `bionic`. Docker does not offer any guarantees on untested
> and unsupported Ubuntu distributions.
```console ```console
$ echo \ $ echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \ "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] {{ download-url-base }} \

View File

@ -9,6 +9,7 @@ redirect_from:
- /machine/RELEASE/ - /machine/RELEASE/
- /machine/completion/ - /machine/completion/
- /machine/concepts/ - /machine/concepts/
- /machine/drivers/
- /machine/drivers/aws/ - /machine/drivers/aws/
- /machine/drivers/azure/ - /machine/drivers/azure/
- /machine/drivers/digital-ocean/ - /machine/drivers/digital-ocean/