Merge pull request docker#8005 from thaJeztah/remove_wheezy_jessie

Installation docs: remove distros that are no longer supported, and cleanup/align instructions

Author: ahh-docker

install/linux/docker-ce/debian.md

@@ -27,18 +27,15 @@ and distributions for different Docker editions, see
 To install Docker CE, you need the 64-bit version of one of these Debian or
 Raspbian versions:
 
-- Buster 10 (Docker CE 17.11 Edge only)
+- Buster 10
 - Stretch 9 (stable) / Raspbian Stretch
-- Jessie 8 (LTS) / Raspbian Jessie
-- Wheezy 7.7 (LTS)
 
-Docker CE is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectures for Jessie and
-Stretch.
+Docker CE is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectures.
 
 ### Uninstall old versions
 
-Older versions of Docker were called `docker` or `docker-engine`. If these are
-installed, uninstall them:
+Older versions of Docker were called `docker`, `docker.io `, or `docker-engine`.
+If these are installed, uninstall them:
 
 ```bash
 $ sudo apt-get remove docker docker-engine docker.io containerd runc
@@ -49,20 +46,6 @@ It's OK if `apt-get` reports that none of these packages are installed.
 The contents of `/var/lib/docker/`, including images, containers, volumes, and
 networks, are preserved. The Docker CE package is now called `docker-ce`.
 
-### Extra steps for Wheezy 7.7
-
-- You need at least version 3.10 of the Linux kernel. Debian Wheezy ships with
-  version 3.2, so you may need to
-  [update the kernel](https://wiki.debian.org/HowToUpgradeKernel){: target="_blank" class="_" }.
-  To check your kernel version:
-
-  ```bash
-  $ uname -r
-  ```
-
-- Enable the `backports` repository. See the
-  [Debian documentation](https://backports.debian.org/Instructions/){: target="_blank" class"_"}.
-
 ## Install Docker CE
 
 You can install Docker CE in different ways, depending on your needs:
@@ -94,7 +77,7 @@ from the repository.
 
 #### Set up the repository
 
-{% assign download-url-base = 'https://download.docker.com/linux/debian' %}
+{% assign download-url-base = "https://download.docker.com/linux/debian" %}
 
 1.  Update the `apt` package index:
 
@@ -104,40 +87,19 @@ from the repository.
 
 2.  Install packages to allow `apt` to use a repository over HTTPS:
 
-    <ul class="nav nav-tabs">
-      <li class="active"><a data-toggle="tab" data-target="#jessie">Jessie or newer</a></li>
-      <li><a data-toggle="tab" data-target="#wheezy">Wheezy or older</a></li>
-    </ul>
-    <div class="tab-content">
-    <div id="jessie" class="tab-pane fade in active" markdown="1">
-
-    ```bash
-    $ sudo apt-get install \
-         apt-transport-https \
-         ca-certificates \
-         curl \
-         gnupg2 \
-         software-properties-common
-    ```
-
-    </div>
-    <div id="wheezy" class="tab-pane fade" markdown="1">
-
     ```bash
     $ sudo apt-get install \
-         apt-transport-https \
-         ca-certificates \
-         curl \
-         python-software-properties
+        apt-transport-https \
+        ca-certificates \
+        curl \
+        gnupg2 \
+        software-properties-common
     ```
 
-    </div>
-    </div> <!-- tab-content -->
-
 3.  Add Docker's official GPG key:
 
     ```bash
-    $ curl -fsSL {{ download-url-base}}/gpg | sudo apt-key add -
+    $ curl -fsSL {{ download-url-base }}/gpg | sudo apt-key add -
     ```
 
     Verify that you now have the key with the fingerprint
@@ -160,7 +122,7 @@ from the repository.
     word `stable` in the commands below.
 
     > **Note**: The `lsb_release -cs` sub-command below returns the name of your
-    > Debian distribution, such as `jessie`.
+    > Debian distribution, such as `stretch`.
 
     To also add the **edge** repository, add `edge` after `stable` on the last
     line of the command.
@@ -184,34 +146,25 @@ from the repository.
     <div id="armhf_repo" class="tab-pane fade" markdown="1">
 
     ```bash
-    $ echo "deb [arch=armhf] {{ download-url-base }} \
-         $(lsb_release -cs) stable" | \
-        sudo tee /etc/apt/sources.list.d/docker.list
+    $ sudo add-apt-repository \
+       "deb [arch=armhf] {{ download-url-base }} \
+       $(lsb_release -cs) \
+       stable"
     ```
 
     </div>
     <div id="arm64_repo" class="tab-pane fade" markdown="1">
 
     ```bash
-    $ echo "deb [arch=arm64] {{ download-url-base }} \
-         $(lsb_release -cs) stable" | \
-        sudo tee /etc/apt/sources.list.d/docker.list
+    $ sudo add-apt-repository \
+       "deb [arch=arm64] {{ download-url-base }} \
+       $(lsb_release -cs) \
+       stable"
     ```
 
     </div>
     </div> <!-- tab-content -->
 
-5.  **Wheezy only**: The version of `add-apt-repository` on Wheezy adds a `deb-src`
-    repository that does not exist. You need to comment out this repository or
-    running `apt-get update` fails. Edit `/etc/apt/sources.list`. Find the
-    line like the following, and comment it out or remove it:
-
-    ```none
-    deb-src [arch=amd64] https://download.docker.com/linux/debian wheezy stable
-    ```
-
-    Save and exit the file.
-
     > **Note**: Starting with Docker 17.06, stable releases are also pushed to
     > the **edge** and **test** repositories.
 
@@ -248,44 +201,35 @@ from the repository.
     ```bash
     $ apt-cache madison docker-ce
 
-    docker-ce | {{ site.docker_ce_stable_version }}.0~ce-0~debian | https://download.docker.com/linux/debian jessie/stable amd64 Packages
+      docker-ce | 5:18.09.1~3-0~debian-stretch | {{ download-url-base }} stretch/stable amd64 Packages
+      docker-ce | 5:18.09.0~3-0~debian-stretch | {{ download-url-base }} stretch/stable amd64 Packages
+      docker-ce | 18.06.1~ce~3-0~debian        | {{ download-url-base }} stretch/stable amd64 Packages
+      docker-ce | 18.06.0~ce~3-0~debian        | {{ download-url-base }} stretch/stable amd64 Packages
+      ...
     ```
 
-    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 an equals sign (`=`), for example,
-       `docker-ce=18.03.0.ce`.
+    b. Install a specific version using the version string from the second column,
+       for example, `5:18.09.1~3-0~debian-stretch `.
 
     ```bash
     $ sudo apt-get install docker-ce=<VERSION_STRING>
     ```
 
-    The Docker daemon starts automatically.
-
 4.  Verify that Docker CE is installed correctly by running the `hello-world`
     image.
 
-    **x86_64**:
-
     ```bash
     $ sudo docker run hello-world
     ```
 
-    **armhf**:
-
-    ```bash
-    $ sudo docker run armhf/hello-world
-    ```
-
     This command downloads a test image and runs it in a container. When the
     container runs, it prints an informational message and exits.
 
 Docker CE is installed and running. The `docker` group is created but no users
-are added to it. You need to use `sudo` to run Docker
-commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow
+are added to it. You need to use `sudo` to run Docker 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. For Raspbian, you can optionally
-[install Docker Compose for Raspbian](#install-docker-compose-for-raspbian).
+steps.
 
 #### Upgrade Docker CE
 
@@ -299,10 +243,10 @@ 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 need to download
 a new file each time you want to upgrade Docker.
 
-1.  Go to `{{ download-url-base }}/dists/`,
-    choose your Debian version, browse to `pool/stable/`, choose
-    `amd64`, `armhf`, or `arm64` and download the `.deb` file for the Docker CE version you
-    want to install.
+1.  Go to [`{{ download-url-base }}/dists/`]({{ download-url-base }}/dists/){: target="_blank" class="_" },
+    choose your Debian version, browse to `pool/stable/`, choose `amd64`,
+    `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`.
@@ -328,37 +272,18 @@ a new file each time you want to upgrade Docker.
     container runs, it prints an informational message and exits.
 
 Docker CE is installed and running. The `docker` group is created but no users
-are added to it. You need to use `sudo` to run Docker
-commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
+are added to it. You need to use `sudo` to run Docker commands.
+Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
 to allow non-privileged users to run Docker commands and for other optional
-configuration steps. For Raspbian, you can optionally
-[install Docker Compose for Raspbian](#install-docker-compose-for-raspbian).
+configuration steps.
 
 #### Upgrade Docker CE
 
-To upgrade Docker, download the newer package file and repeat the
+To upgrade Docker CE, download the newer package file and repeat the
 [installation procedure](#install-from-a-package), pointing to the new file.
 
 {% include install-script.md %}
 
-## Install Docker Compose for Raspbian
-
-You can install Docker Compose using `pip`:
-
-```bash
-$ sudo pip install docker-compose
-```
-
-[Hypriot](https://hypriot.com/){: target="_blank" class="_" } provides a static
-binary of `docker-compose` for Raspbian. It may not always be up to date, but if
-space is at a premium, you may find it useful. To use it, first follow Hypriot's
-[instructions for setting up the repository](https://blog.hypriot.com/post/your-number-one-source-for-docker-on-arm/){: target="_blank" class="_" },
-then run the following command:
-
-```bash
-sudo apt-get install docker-compose
-```
-
 ## Uninstall Docker CE
 
 1.  Uninstall the Docker CE package:
@@ -380,5 +305,4 @@ You must delete any edited configuration files manually.
 ## Next steps
 
 - Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
-
 - Continue with the [User Guide](/engine/userguide/index.md).

install/linux/docker-ce/fedora.md

@@ -25,9 +25,8 @@ and distributions for different Docker editions, see
 
 To install Docker, you need the 64-bit version of one of these Fedora versions:
 
-- 26
-- 27
 - 28
+- 29
 
 ### Uninstall old versions