Remove edge from installation instructions

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-01-11 17:26:10 +01:00
parent 652f6703bf
commit 9b18fa836e
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
5 changed files with 96 additions and 110 deletions

View File

@ -70,8 +70,8 @@ instructions for enabling and configuring AppArmor or SELinux.
### Install static binaries
1. Download the static binary archive. Go to
[https://download.docker.com/linux/static/stable/](https://download.docker.com/linux/static/stable/x86_64/)
(or change `stable` to `edge` or `test`),
[https://download.docker.com/linux/static/stable/](https://download.docker.com/linux/static/stable/)
(or change `stable` to `nightly` or `test`),
choose your hardware platform, and download the `.tgz` file relating to the
version of Docker CE you want to install.
@ -123,7 +123,7 @@ The macOS binary includes the Docker client only. It does not include the
1. Download the static binary archive. Go to
[https://download.docker.com/mac/static/stable/x86_64/](https://download.docker.com/mac/static/stable/x86_64/),
(or change `stable` to `edge` or `test`),
(or change `stable` to `nightly` or `test`),
and download the `.tgz` file relating to the version of Docker CE you want
to install.

View File

@ -96,9 +96,7 @@ from the repository.
lvm2
```
2. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install builds from the
**edge** or **test** repositories as well.
2. Use the following command to set up the **stable** repository.
```bash
$ sudo yum-config-manager \
@ -106,30 +104,31 @@ from the repository.
{{ download-url-base }}/docker-ce.repo
```
3. **Optional**: Enable the **edge** and **test** repositories. These
repositories are included in the `docker.repo` file above but are disabled
by default. You can enable them alongside the stable repository.
```bash
$ sudo yum-config-manager --enable docker-ce-edge
```
```bash
$ sudo yum-config-manager --enable docker-ce-test
```
You can disable the **edge** or **test** repository by running the
`yum-config-manager` command with the `--disable` flag. To re-enable it, use
the `--enable` flag. The following command disables the **edge** repository.
```bash
$ sudo yum-config-manager --disable docker-ce-edge
```
> **Note**: Starting with Docker 17.06, stable releases are also pushed to
> the **edge** and **test** repositories.
[Learn about **stable** and **edge** builds](/install/index.md).
> **Optional**: Enable the **nightly** or **test** repositories.
>
> These repositories are included in the `docker.repo` file above but are disabled
> by default. You can enable them alongside the stable repository. The following
> command enables the **nightly** repository.
>
> ```bash
> $ sudo yum-config-manager --enable docker-ce-nightly
> ```
>
> To enable the **test** channel, run the following command:
>
> ```bash
> $ sudo yum-config-manager --enable docker-ce-test
> ```
>
> You can disable the **nightly** or **test** repository by running the
> `yum-config-manager` command with the `--disable` flag. To re-enable it, use
> the `--enable` flag. The following command disables the **nightly** repository.
>
> ```bash
> $ sudo yum-config-manager --disable docker-ce-nightly
> ```
>
> [Learn about **nightly** and **test** channels](/install/index.md).
#### Install Docker CE
@ -160,16 +159,19 @@ from the repository.
```bash
$ yum list docker-ce --showduplicates | sort -r
docker-ce.x86_64 {{ site.docker_ce_version }}.0.ce-1.el7.centos docker-ce-stable
docker-ce.x86_64 3:18.09.1-3.el7 docker-ce-stable
docker-ce.x86_64 3:18.09.0-3.el7 docker-ce-stable
docker-ce.x86_64 18.06.1.ce-3.el7 docker-ce-stable
docker-ce.x86_64 18.06.0.ce-3.el7 docker-ce-stable
```
The list returned depends on which repositories are enabled, and is specific
to your version of CentOS (indicated by the `.el7` suffix in this example).
b. Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column) up to
the first hyphen, separated by a hyphen (`-`), for example,
`docker-ce-18.03.0.ce`.
the package name (`docker-ce`) plus the version string (2nd column)
starting at the first colon (`:`), up to the first hyphen, separated by
a hyphen (`-`). For example, `docker-ce-18.09.1`.
```bash
$ sudo yum install docker-ce-<VERSION STRING>
@ -183,7 +185,7 @@ from the repository.
$ sudo systemctl start docker
```
4. Verify that `docker` is installed correctly by running the `hello-world`
4. Verify that Docker CE is installed correctly by running the `hello-world`
image.
```bash
@ -200,23 +202,22 @@ steps.
#### Upgrade Docker CE
To upgrade Docker CE, follow the
[installation instructions](#install-docker-ce), choosing the new version you want
to install.
To upgrade Docker CE, follow the [installation instructions](#install-docker-ce),
choosing the new version you want to install.
### Install from a package
If you cannot use Docker's repository to install Docker, you can download the
`.rpm` file for your release and install it manually. You need to download
a new file each time you want to upgrade Docker.
a new file each time you want to upgrade Docker CE.
1. Go to
[{{ download-url-base }}/7/x86_64/stable/Packages/]({{ download-url-base }}/7/x86_64/stable/Packages/)
and download the `.rpm` file for the Docker version you want to install.
> **Note**: To install an **edge** package, change the word
> `stable` in the above URL to `edge`.
> [Learn about **stable** and **edge** channels](/install/index.md).
> **Note**: To install a **nightly** or **test** (pre-release) package,
> change the word `stable` in the above URL to `nightly` or `test`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
the Docker package.
@ -234,7 +235,7 @@ a new file each time you want to upgrade Docker.
$ sudo systemctl start docker
```
4. Verify that `docker` is installed correctly by running the `hello-world`
4. Verify that Docker CE is installed correctly by running the `hello-world`
image.
```bash

View File

@ -115,18 +115,13 @@ from the repository.
sub 4096R/F273FCD8 2017-02-22
```
4. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install builds from the
**edge** or **test** repositories as well. To add the **edge** or
**test** repository, add the word `edge` or `test` (or both) after the
word `stable` in the commands below.
4. Use the following command to set up the **stable** repository. To add the
**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](/install/index.md).
> **Note**: The `lsb_release -cs` sub-command below returns the name of your
> Debian distribution, such as `stretch`.
To also add the **edge** repository, add `edge` after `stable` on the last
line of the command.
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" data-target="#x86_64_repo">x86_64 / amd64</a></li>
<li><a data-toggle="tab" data-target="#armhf_repo">armhf</a></li>
@ -165,11 +160,6 @@ from the repository.
</div>
</div> <!-- tab-content -->
> **Note**: Starting with Docker 17.06, stable releases are also pushed to
> the **edge** and **test** repositories.
[Learn about **stable** and **edge** channels](/install/index.md).
#### Install Docker CE
> **Note**: This procedure works for Debian on `x86_64` / `amd64`, Debian ARM,
@ -248,9 +238,9 @@ a new file each time you want to upgrade Docker.
`armhf`, or `arm64` and download the `.deb` file for the Docker CE version
you want to install.
> **Note**: To install an **edge** package, change the word
> `stable` in the URL to `edge`.
> [Learn about **stable** and **edge** channels](/install/index.md).
> **Note**: To install a **nightly** package, change the word
> `stable` in the URL to `nightly`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
the Docker package.

View File

@ -71,7 +71,7 @@ You can install Docker CE in different ways, depending on your needs:
### Install using the repository
Before you install Docker CE for the first time on a new host machine, you need
to set up the Docker repository. Afterward, you can install and update Docker CE
to set up the Docker repository. Afterward, you can install and update Docker
from the repository.
#### Set up the repository
@ -85,9 +85,7 @@ from the repository.
$ sudo dnf -y install dnf-plugins-core
```
2. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install builds from the
**edge** or **test** repositories as well.
2. Use the following command to set up the **stable** repository.
```bash
$ sudo dnf config-manager \
@ -95,30 +93,32 @@ from the repository.
{{ download-url-base }}/docker-ce.repo
```
3. **Optional**: Enable the **edge** and **test** repositories. These
repositories are included in the `docker.repo` file above but are disabled
by default. You can enable them alongside the stable repository.
```bash
$ sudo dnf config-manager --set-enabled docker-ce-edge
```
```bash
$ sudo dnf config-manager --set-enabled docker-ce-test
```
You can disable the **edge** or **test** repository by running the
`dnf config-manager` command with the `--disable` flag. To re-enable it, use
the `--enable` flag. The following command disables the **edge** repository.
```bash
$ sudo dnf config-manager --set-disabled docker-ce-edge
```
> **Note**: Starting with Docker 17.06, stable releases are also pushed to
> the **edge** and **test** repositories.
[Learn about **stable** and **edge** channels](/install/index.md).
> **Optional**: Enable the **nightly** or **test** repositories.
>
> These repositories are included in the `docker.repo` file above but are disabled
> by default. You can enable them alongside the stable repository. The following
> command enables the **nightly** repository.
>
> ```bash
> $ sudo dnf config-manager --set-enabled docker-ce-nightly
> ```
>
> To enable the **test** channel, run the following command:
>
> ```bash
> $ sudo dnf config-manager --set-enabled docker-ce-test
> ```
>
> You can disable the **nightly** or **test** repository by running the
> `dnf config-manager` command with the `--set-disabled` flag. To re-enable it,
> use the `--set-enabled` flag. The following command disables the **nightly**
> repository.
>
> ```bash
> $ sudo dnf config-manager --set-disabled docker-ce-nightly
> ```
>
> [Learn about **nightly** and **test** channels](/install/index.md).
#### Install Docker CE
@ -149,16 +149,19 @@ from the repository.
```bash
$ dnf list docker-ce --showduplicates | sort -r
docker-ce.x86_64 {{ site.docker_ce_version }}.0.fc26 docker-ce-stable
docker-ce.x86_64 3:18.09.1-3.fc28 docker-ce-stable
docker-ce.x86_64 3:18.09.0-3.fc28 docker-ce-stable
docker-ce.x86_64 18.06.1.ce-3.fc28 docker-ce-stable
docker-ce.x86_64 18.06.0.ce-3.fc28 docker-ce-stable
```
The list returned depends on which repositories are enabled, and is specific
to your version of Fedora (indicated by the `.fc26` suffix in this example).
to your version of Fedora (indicated by the `.fc28` suffix in this example).
b. Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column) up to
the first hyphen, separated by a hyphen (`-`), for example,
`docker-ce-18.03.0.ce`.
`docker-ce-3:18.09.1`.
```bash
$ sudo dnf -y install docker-ce-<VERSION STRING>
@ -183,16 +186,14 @@ from the repository.
container runs, it prints an informational message and exits.
Docker CE is installed and running. You need to use `sudo` to run Docker
commands. Continue to
[Linux postinstall](/install/linux/linux-postinstall.md) to allow
commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow
non-privileged users to run Docker commands and for other optional configuration
steps.
#### Upgrade Docker CE
To upgrade Docker CE, follow the
[installation instructions](#install-docker-ce), choosing the new version you want
to install.
To upgrade Docker CE, follow the [installation instructions](#install-docker-ce),
choosing the new version you want to install.
### Install from a package
@ -204,8 +205,9 @@ a new file each time you want to upgrade Docker CE.
version of Fedora. Go to `x86_64/stable/Packages/`
and download the `.rpm` file for the Docker version you want to install.
> **Note**: To install an **edge** package, change the word
> `stable` in the above URL to `edge`.
> **Note**: To install a **nightly** or **test** (pre-release) package,
> change the word `stable` in the above URL to `nightly` or `test`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
the Docker package.

View File

@ -125,11 +125,9 @@ from the repository.
sub 4096R/F273FCD8 2017-02-22
```
4. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install builds from the
**edge** or **test** repositories as well. To add the **edge** or
**test** repository, add the word `edge` or `test` (or both) after the
word `stable` in the commands below.
4. Use the following command to set up the **stable** repository. To add the
**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](/install/index.md).
> **Note**: The `lsb_release -cs` sub-command below returns the name of your
> Ubuntu distribution, such as `xenial`. Sometimes, in a distribution
@ -198,11 +196,6 @@ from the repository.
</div>
</div> <!-- tab-content -->
> **Note**: Starting with Docker 17.06, stable releases are also pushed to
> the **edge** and **test** repositories.
[Learn about **stable** and **edge** channels](/install/index.md).
#### Install Docker CE
1. Update the `apt` package index.
@ -278,9 +271,9 @@ a new file each time you want to upgrade Docker.
`armhf`, `arm64`, `ppc64el`, or `s390x`, and download the `.deb` file for the
Docker CE version you want to install.
> **Note**: To install an **edge** package, change the word
> `stable` in the URL to `edge`.
> [Learn about **stable** and **edge** channels](/install/index.md).
> **Note**: To install a **nightly** package, change the word
> `stable` in the URL to `nightly`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
the Docker package.