From 269d8e14fb94bc65ac8f8dfd731921d0d7a15945 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 27 Mar 2017 16:37:57 -0700 Subject: [PATCH] Fix incorrect installation paths for package-based installs (#2479) Additional edits for consistency --- engine/installation/linux/centos.md | 14 +++++++------- engine/installation/linux/debian.md | 26 +++++++++++++++---------- engine/installation/linux/fedora.md | 20 +++++++++++-------- engine/installation/linux/suse.md | 4 ++-- engine/installation/linux/ubuntu.md | 30 ++++++++++++++--------------- 5 files changed, 51 insertions(+), 43 deletions(-) diff --git a/engine/installation/linux/centos.md b/engine/installation/linux/centos.md index c8a459c77d..3d945e60a0 100644 --- a/engine/installation/linux/centos.md +++ b/engine/installation/linux/centos.md @@ -6,6 +6,8 @@ redirect_from: title: Get Docker for CentOS --- +{% assign minor-version = "17.03" %} + To get started with Docker on CentOS, make sure you [meet the prerequisites](#prerequisites), then [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. - ### Uninstall old versions 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 ``` -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 $ 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 > source packages as well, omit the `.x86_64` from the package name. - {% assign minor-version = "17.03" %} - ```bash $ 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. > **Note**: To install an **edge** package, change the word - > `stable` in the > URL to `edge`. For information about **stable** and - > **edge** builds, see - > [Docker variants](/engine/installation/#docker-variants). + > `stable` in the > URL to `edge`. + > [Learn about **stable** and **edge** channels](/engine/installation/). - **Docker EE**: Go to the Docker EE repository URL associated with your trial or subscription in your browser. Go to diff --git a/engine/installation/linux/debian.md b/engine/installation/linux/debian.md index a006358678..bccfef0536 100644 --- a/engine/installation/linux/debian.md +++ b/engine/installation/linux/debian.md @@ -7,6 +7,8 @@ redirect_from: title: Get Docker for Debian --- +{% assign minor-version = "17.03" %} + To get started with Docker on Debian, make sure you [meet the prerequisites](#prerequisites), then [install Docker](#install-docker). @@ -118,15 +120,15 @@ from the repository. sub 4096R/F273FCD8 2017-02-22 ``` -3. Use the following command to set up the **stable** repository. - - To add the **edge** repository, add `edge` after `stable` on the last line of - the command. For information about **stable** and **edge** builds, see - [Docker variants](/engine/installation/#docker-variants). +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 + as well. > **Note**: The `lsb_release -cs` sub-command below returns the name of your > Debian distribution, such as `jessie`. + To also add the **edge** repository, add `edge` after `stable` on the last + line of the command. ```bash $ sudo add-apt-repository \ @@ -135,6 +137,8 @@ from the repository. stable" ``` + [Learn about **stable** and **edge** channels](/engine/installation/). + #### Install Docker CE 1. Update the `apt` package index. @@ -164,7 +168,7 @@ from the repository. ```bash $ 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, @@ -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 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/) - and download the `.deb` file for the Docker version you want to install and - for your version of Debian. +1. Go to [{{ download-url-base }}/dists//]({{ download-url-base }}/dists/), + choose your Ubuntu version, browse to `stable/pool/stable/amd64/`, and + 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 - > `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 the Docker package. diff --git a/engine/installation/linux/fedora.md b/engine/installation/linux/fedora.md index 151c552c97..77baad9548 100644 --- a/engine/installation/linux/fedora.md +++ b/engine/installation/linux/fedora.md @@ -6,6 +6,8 @@ redirect_from: title: Get Docker for Fedora --- +{% assign minor-version = "17.03" %} + To get started with Docker on Fedora, make sure you [meet the prerequisites](#prerequisites), then [install Docker](#install-docker). @@ -73,7 +75,9 @@ the repository. $ 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 $ sudo dnf config-manager \ @@ -83,10 +87,7 @@ the repository. 3. **Optional**: Enable the **edge** repository. This repository is included in the `docker.repo` file above but is disabled by default. You can enable - it alongside the stable repository. For information about **stable** and - **edge** builds, see - [Docker variants](/engine/installation/#docker-variants). - + it alongside the stable repository. ```bash $ sudo dnf config-manager --enable docker-ce-edge @@ -100,6 +101,8 @@ the repository. $ sudo dnf config-manager --disable docker-ce-edge ``` + [Learn about **stable** and **edge** channels](/engine/installation/). + #### Install Docker CE 1. Update the `dnf` package index. @@ -137,7 +140,7 @@ the repository. ```bash $ 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 @@ -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 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. > **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 the Docker package. diff --git a/engine/installation/linux/suse.md b/engine/installation/linux/suse.md index 62230ed56b..0a7981f7a4 100644 --- a/engine/installation/linux/suse.md +++ b/engine/installation/linux/suse.md @@ -6,6 +6,8 @@ redirect_from: 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 [meet the prerequisites](#prerequisites), then [install Docker](#install-docker). @@ -79,8 +81,6 @@ the repository. Use the following command to set up the **stable** repository, using the Docker EE repository URL you located in the [prerequisites](#prerequisites). -{% assign minor-version = "17.03" %} - ```bash $ sudo zypper addrepo \ /12.3/x86_64/stable-{{ minor-version }} \ diff --git a/engine/installation/linux/ubuntu.md b/engine/installation/linux/ubuntu.md index bb3260dc00..6cb9026779 100644 --- a/engine/installation/linux/ubuntu.md +++ b/engine/installation/linux/ubuntu.md @@ -126,8 +126,9 @@ The procedure for setting up the repository is different for [Docker CE](#docker 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 + as well. > **Note**: The `lsb_release -cs` sub-command below returns the name of your > 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 > `trusty`. - - To add the **edge** repository, add `edge` after `stable` on the last line of - the command. For information about **stable** and **edge** builds, see - [Docker variants](/engine/installation/#docker-variants). + To also add the **edge** repository, add `edge` after `stable` on the last + line of the command. ```bash $ sudo add-apt-repository \ @@ -149,7 +148,7 @@ The procedure for setting up the repository is different for [Docker CE](#docker stable" ``` - [Learn about **stable** and **edge** builds](/engine/installation/). + [Learn about **stable** and **edge** channels](/engine/installation/). ##### 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 ``` - 3. Use the following command to set up the **stable** repository, replacing `` with the URL you noted down in the [prerequisites](#prerequisites). @@ -191,7 +189,7 @@ The procedure for setting up the repository is different for [Docker CE](#docker ```bash $ sudo add-apt-repository \ - "deb [arch=amd64] <-DOCKER-EE-URL> \ + "deb [arch=amd64] \ $(lsb_release -cs) \ 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. - **Docker CE**: Go to - [{{ download-url-base }}/pool/stable-{{ minor-version }}/amd64/]({{ download-url-base }}/pool/stable-{{ minor-version }}/amd64/) - and download the `.deb` file for the Docker version you want to install and - for your version of Ubuntu. + [{{ download-url-base }}/dists/]({{ download-url-base }}/dists/), choose your + Ubuntu version, browse to `stable/pool/stable/amd64/`, and download the + `.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 - > `stable` in the > URL to `edge`. For information about **stable** and - > **edge** builds, see - > [Docker variants](/engine/installation/#docker-variants). + > `stable` in the URL to `edge`. + > [Learn about **stable** and **edge** channels](/engine/installation/). - **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. 2. Install Docker, changing the path below to the path where you downloaded