Fix incorrect installation paths for package-based installs (#2479)

Additional edits for consistency
This commit is contained in:
Misty Stanley-Jones 2017-03-27 16:37:57 -07:00 committed by John Mulhausen
parent d8a53c0677
commit 269d8e14fb
5 changed files with 51 additions and 43 deletions

View File

@ -6,6 +6,8 @@ redirect_from:
title: Get Docker for CentOS title: Get Docker for CentOS
--- ---
{% assign minor-version = "17.03" %}
To get started with Docker on CentOS, make sure you To get started with Docker on CentOS, make sure you
[meet the prerequisites](#prerequisites), then [meet the prerequisites](#prerequisites), then
[install Docker](#install-docker). [install Docker](#install-docker).
@ -33,7 +35,6 @@ To learn more about Docker EE, see
To install Docker, you need the 64-bit version of CentOS 7. To install Docker, you need the 64-bit version of CentOS 7.
### Uninstall old versions ### Uninstall old versions
Older versions of Docker were called `docker` or `docker-engine`. If these are Older versions of Docker were called `docker` or `docker-engine`. If these are
@ -87,7 +88,9 @@ Repository set-up instructions are different for [Docker CE](#docker-ce) and
$ sudo yum install -y yum-utils $ sudo yum install -y yum-utils
``` ```
2. Use the following command to set up the **stable** repository: 2. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install **edge** builds
as well.
```bash ```bash
$ sudo yum-config-manager \ $ sudo yum-config-manager \
@ -178,8 +181,6 @@ Repository set-up instructions are different for [Docker CE](#docker-ce) and
> **Note**: This `yum list` command only shows binary packages. To show > **Note**: This `yum list` command only shows binary packages. To show
> source packages as well, omit the `.x86_64` from the package name. > source packages as well, omit the `.x86_64` from the package name.
{% assign minor-version = "17.03" %}
```bash ```bash
$ yum list docker-ce.x86_64 --showduplicates |sort -r $ yum list docker-ce.x86_64 --showduplicates |sort -r
@ -238,9 +239,8 @@ a new file each time you want to upgrade Docker.
and download the `.rpm` file for the Docker version you want to install. and download the `.rpm` file for the Docker version you want to install.
> **Note**: To install an **edge** package, change the word > **Note**: To install an **edge** package, change the word
> `stable` in the > URL to `edge`. For information about **stable** and > `stable` in the > URL to `edge`.
> **edge** builds, see > [Learn about **stable** and **edge** channels](/engine/installation/).
> [Docker variants](/engine/installation/#docker-variants).
- **Docker EE**: Go to the Docker EE repository URL associated with your - **Docker EE**: Go to the Docker EE repository URL associated with your
trial or subscription in your browser. Go to trial or subscription in your browser. Go to

View File

@ -7,6 +7,8 @@ redirect_from:
title: Get Docker for Debian title: Get Docker for Debian
--- ---
{% assign minor-version = "17.03" %}
To get started with Docker on Debian, make sure you To get started with Docker on Debian, make sure you
[meet the prerequisites](#prerequisites), then [meet the prerequisites](#prerequisites), then
[install Docker](#install-docker). [install Docker](#install-docker).
@ -118,15 +120,15 @@ from the repository.
sub 4096R/F273FCD8 2017-02-22 sub 4096R/F273FCD8 2017-02-22
``` ```
3. Use the following command to set up the **stable** repository. 3. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install **edge** builds
To add the **edge** repository, add `edge` after `stable` on the last line of as well.
the command. For information about **stable** and **edge** builds, see
[Docker variants](/engine/installation/#docker-variants).
> **Note**: The `lsb_release -cs` sub-command below returns the name of your > **Note**: The `lsb_release -cs` sub-command below returns the name of your
> Debian distribution, such as `jessie`. > Debian distribution, such as `jessie`.
To also add the **edge** repository, add `edge` after `stable` on the last
line of the command.
```bash ```bash
$ sudo add-apt-repository \ $ sudo add-apt-repository \
@ -135,6 +137,8 @@ from the repository.
stable" stable"
``` ```
[Learn about **stable** and **edge** channels](/engine/installation/).
#### Install Docker CE #### Install Docker CE
1. Update the `apt` package index. 1. Update the `apt` package index.
@ -164,7 +168,7 @@ from the repository.
```bash ```bash
$ apt-cache madison docker-ce $ apt-cache madison docker-ce
docker-ce | 17.03.0~ce-0~debian-jessie | {{ download-url-base}} jessie/stable amd64 Packages docker-ce | {{ minor-version }}.0~ce-0~debian-jessie | {{ download-url-base}} jessie/stable amd64 Packages
``` ```
The contents of the list depend upon which repositories are enabled, The contents of the list depend upon which repositories are enabled,
@ -208,12 +212,14 @@ If you cannot use Docker's repository to install Docker CE, you can download the
`.deb` file for your release and install it manually. You will need to download `.deb` file for your release and install it manually. You will need to download
a new file each time you want to upgrade Docker. a new file each time you want to upgrade Docker.
1. Go to [{{ download-url-base }}/pool/stable/amd64/]({{ download-url-base }}/pool/stable/amd64/) 1. Go to [{{ download-url-base }}/dists//]({{ download-url-base }}/dists/),
and download the `.deb` file for the Docker version you want to install and choose your Ubuntu version, browse to `stable/pool/stable/amd64/`, and
for your version of Debian. download the `.deb` file for the Docker version you want to install and for
your version of Debian.
> **Note**: To install an **edge** package, change the word > **Note**: To install an **edge** package, change the word
> `stable` in the URL to `edge`. > `stable` in the URL to `edge`.
> [Learn about **stable** and **edge** channels](/engine/installation/).
2. Install Docker CE, changing the path below to the path where you downloaded 2. Install Docker CE, changing the path below to the path where you downloaded
the Docker package. the Docker package.

View File

@ -6,6 +6,8 @@ redirect_from:
title: Get Docker for Fedora title: Get Docker for Fedora
--- ---
{% assign minor-version = "17.03" %}
To get started with Docker on Fedora, make sure you To get started with Docker on Fedora, make sure you
[meet the prerequisites](#prerequisites), then [meet the prerequisites](#prerequisites), then
[install Docker](#install-docker). [install Docker](#install-docker).
@ -73,7 +75,9 @@ the repository.
$ sudo dnf -y install dnf-plugins-core $ sudo dnf -y install dnf-plugins-core
``` ```
2. Use the following command to set up the **stable** repository: 2. Use the following command to set up the **stable** repository. You always
need the **stable** repository, even if you want to install **edge** builds
as well
```bash ```bash
$ sudo dnf config-manager \ $ sudo dnf config-manager \
@ -83,10 +87,7 @@ the repository.
3. **Optional**: Enable the **edge** repository. This repository is included 3. **Optional**: Enable the **edge** repository. This repository is included
in the `docker.repo` file above but is disabled by default. You can enable in the `docker.repo` file above but is disabled by default. You can enable
it alongside the stable repository. For information about **stable** and it alongside the stable repository.
**edge** builds, see
[Docker variants](/engine/installation/#docker-variants).
```bash ```bash
$ sudo dnf config-manager --enable docker-ce-edge $ sudo dnf config-manager --enable docker-ce-edge
@ -100,6 +101,8 @@ the repository.
$ sudo dnf config-manager --disable docker-ce-edge $ sudo dnf config-manager --disable docker-ce-edge
``` ```
[Learn about **stable** and **edge** channels](/engine/installation/).
#### Install Docker CE #### Install Docker CE
1. Update the `dnf` package index. 1. Update the `dnf` package index.
@ -137,7 +140,7 @@ the repository.
```bash ```bash
$ dnf list docker-ce.x86_64 --showduplicates |sort -r $ dnf list docker-ce.x86_64 --showduplicates |sort -r
docker-ce.x86_64 17.03.0.fc24 docker-ce-stable docker-ce.x86_64 {{ minor-version }}.0.fc24 docker-ce-stable
``` ```
The contents of the list depend upon which repositories are enabled, and The contents of the list depend upon which repositories are enabled, and
@ -184,11 +187,12 @@ If you cannot use Docker's repository to install Docker, you can download the
`.rpm` file for your release and install it manually. You will need to download `.rpm` file for your release and install it manually. You will need to download
a new file each time you want to upgrade Docker. a new file each time you want to upgrade Docker.
1. Go to [{{ download-url-base }}/7/x86_64/stable/]({{ download-url-base }}/7/x86_64/stable/) 1. Go to [{{ download-url-base }}/]({{ download-url-base }}/) and choose your
version of Fedora. Go to `x86_64/stable/Packages/`
and download the `.rpm` file for the Docker version you want to install. and download the `.rpm` file for the Docker version you want to install.
> **Note**: To install an **edge** package, change the word > **Note**: To install an **edge** package, change the word
> `stable` in the > URL to `edge`. > `stable` in the URL to `edge`.
2. Install Docker, changing the path below to the path where you downloaded 2. Install Docker, changing the path below to the path where you downloaded
the Docker package. the Docker package.

View File

@ -6,6 +6,8 @@ redirect_from:
title: Get Docker for and SLES title: Get Docker for and SLES
--- ---
{% assign minor-version = "17.03" %}
To get started with Docker on SUSE Linux Enterprise Server (SLES), make sure you To get started with Docker on SUSE Linux Enterprise Server (SLES), make sure you
[meet the prerequisites](#prerequisites), then [meet the prerequisites](#prerequisites), then
[install Docker](#install-docker). [install Docker](#install-docker).
@ -79,8 +81,6 @@ the repository.
Use the following command to set up the **stable** repository, using the Use the following command to set up the **stable** repository, using the
Docker EE repository URL you located in the [prerequisites](#prerequisites). Docker EE repository URL you located in the [prerequisites](#prerequisites).
{% assign minor-version = "17.03" %}
```bash ```bash
$ sudo zypper addrepo \ $ sudo zypper addrepo \
<DOCKER-EE-URL>/12.3/x86_64/stable-{{ minor-version }} \ <DOCKER-EE-URL>/12.3/x86_64/stable-{{ minor-version }} \

View File

@ -126,8 +126,9 @@ The procedure for setting up the repository is different for [Docker CE](#docker
sub 4096R/F273FCD8 2017-02-22 sub 4096R/F273FCD8 2017-02-22
``` ```
3. Use the following command to set up the **stable** repository. You always
3. Use the following command to set up the **stable** repository. need the **stable** repository, even if you want to install **edge** builds
as well.
> **Note**: The `lsb_release -cs` sub-command below returns the name of your > **Note**: The `lsb_release -cs` sub-command below returns the name of your
> Ubuntu distribution, such as `xenial`. > Ubuntu distribution, such as `xenial`.
@ -137,10 +138,8 @@ The procedure for setting up the repository is different for [Docker CE](#docker
> example: If you are using `Linux Mint Rafaela`, you could use > example: If you are using `Linux Mint Rafaela`, you could use
> `trusty`. > `trusty`.
To also add the **edge** repository, add `edge` after `stable` on the last
To add the **edge** repository, add `edge` after `stable` on the last line of line of the command.
the command. For information about **stable** and **edge** builds, see
[Docker variants](/engine/installation/#docker-variants).
```bash ```bash
$ sudo add-apt-repository \ $ sudo add-apt-repository \
@ -149,7 +148,7 @@ The procedure for setting up the repository is different for [Docker CE](#docker
stable" stable"
``` ```
[Learn about **stable** and **edge** builds](/engine/installation/). [Learn about **stable** and **edge** channels](/engine/installation/).
##### Docker EE ##### Docker EE
@ -180,7 +179,6 @@ The procedure for setting up the repository is different for [Docker CE](#docker
sub 4096R/91A29FA3 2017-02-22 sub 4096R/91A29FA3 2017-02-22
``` ```
3. Use the following command to set up the **stable** repository, replacing 3. Use the following command to set up the **stable** repository, replacing
`<DOCKER-EE-URL>` with the URL you noted down in the `<DOCKER-EE-URL>` with the URL you noted down in the
[prerequisites](#prerequisites). [prerequisites](#prerequisites).
@ -191,7 +189,7 @@ The procedure for setting up the repository is different for [Docker CE](#docker
```bash ```bash
$ sudo add-apt-repository \ $ sudo add-apt-repository \
"deb [arch=amd64] <-DOCKER-EE-URL> \ "deb [arch=amd64] <DOCKER-EE-URL> \
$(lsb_release -cs) \ $(lsb_release -cs) \
stable-{{ minor-version }}" stable-{{ minor-version }}"
``` ```
@ -276,17 +274,17 @@ a new file each time you want to upgrade Docker.
1. This step is different for Docker CE and Docker EE. 1. This step is different for Docker CE and Docker EE.
- **Docker CE**: Go to - **Docker CE**: Go to
[{{ download-url-base }}/pool/stable-{{ minor-version }}/amd64/]({{ download-url-base }}/pool/stable-{{ minor-version }}/amd64/) [{{ download-url-base }}/dists/]({{ download-url-base }}/dists/), choose your
and download the `.deb` file for the Docker version you want to install and Ubuntu version, browse to `stable/pool/stable/amd64/`, and download the
for your version of Ubuntu. `.deb` file for the Docker version you want to install and for your
version of Ubuntu.
> **Note**: To install an **edge** package, change the word > **Note**: To install an **edge** package, change the word
> `stable` in the > URL to `edge`. For information about **stable** and > `stable` in the URL to `edge`.
> **edge** builds, see > [Learn about **stable** and **edge** channels](/engine/installation/).
> [Docker variants](/engine/installation/#docker-variants).
- **Docker EE**: Go to the Docker EE repository URL associated with your - **Docker EE**: Go to the Docker EE repository URL associated with your
trial or subscription in your browser. Go to `x86_64/stable` and download trial or subscription in your browser. Go to `x86_64/stable-{{ minor-version }}` and download
the `.rpm` file for the Docker version you want to install. the `.rpm` file for the Docker version you want to install.
2. Install Docker, changing the path below to the path where you downloaded 2. Install Docker, changing the path below to the path where you downloaded