From c73473e9b340bf0c0188fd4153dc57a42dcf1246 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Jan 2019 17:28:39 +0100 Subject: [PATCH 01/11] Remove jessie and wheezy from installation docs These are no longer supported by the current version. Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 57 +++---------------------------- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index 231fa7b199..861eba0591 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -27,13 +27,10 @@ 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 @@ -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: @@ -104,13 +87,6 @@ from the repository. 2. Install packages to allow `apt` to use a repository over HTTPS: - -
-
- ```bash $ sudo apt-get install \ apt-transport-https \ @@ -120,20 +96,6 @@ from the repository. software-properties-common ``` -
-
- - ```bash - $ sudo apt-get install \ - apt-transport-https \ - ca-certificates \ - curl \ - python-software-properties - ``` - -
-
- 3. Add Docker's official GPG key: ```bash @@ -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. @@ -201,17 +163,6 @@ from the repository. -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,7 +199,7 @@ 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 | {{ site.docker_ce_stable_version }}.0~ce-0~debian | https://download.docker.com/linux/debian stretch/stable amd64 Packages ``` b. Install a specific version by its fully qualified package name, which is From 5047fdee863cb65c5da45a49897868154ec07403 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Jan 2019 17:33:45 +0100 Subject: [PATCH 02/11] Remove trusty 14.04, add cosmic 18.10 Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/ubuntu.md | 52 +++++-------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index 4d45d2e4b7..3db26b449a 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -32,13 +32,12 @@ To learn more about Docker EE, see To install Docker CE, you need the 64-bit version of one of these Ubuntu versions: +- Cosmic 18.10 - Bionic 18.04 (LTS) - Xenial 16.04 (LTS) -- Trusty 14.04 (LTS) -Docker CE is supported on Ubuntu on `x86_64`, `arm64`, `armhf`, `s390x` (IBM Z), and `ppc64le` (IBM Power) architectures. - -> **`ppc64le` and `s390x` limitations**: Packages for IBM Z and Power architectures are only available on Ubuntu Xenial and above. +Docker CE is supported on `x86_64` (or `amd64`), `armhf`, `arm64`, `s390x` +(IBM Z), and `ppc64le` (IBM Power) architectures. ### Uninstall old versions @@ -58,45 +57,10 @@ networks, are preserved. The Docker CE package is now called `docker-ce`. Docker CE on Ubuntu supports `overlay2` and `aufs` storage drivers. -- For new installations on version 4 and higher of the Linux kernel, `overlay2` - is supported and preferred over `aufs`. -- For version 3 of the Linux kernel, `aufs` is supported because `overlay` or - `overlay2` drivers are not supported by that kernel version. - -If you need to use `aufs`, you need to do additional preparation as -outlined below. - -#### Extra steps for aufs - - -
-
- -For Ubuntu 16.04 and higher, the Linux kernel includes support for OverlayFS, -and Docker CE uses the `overlay2` storage driver by default. If you need -to use `aufs` instead, you need to configure it manually. -See [aufs](/engine/userguide/storagedriver/aufs-driver.md) - -
-
- -Unless you have a strong reason not to, install the -`linux-image-extra-*` packages, which allow Docker to use the `aufs` storage -drivers. - -```bash -$ sudo apt-get update - -$ sudo apt-get install \ - linux-image-extra-$(uname -r) \ - linux-image-extra-virtual -``` - -
-
+For new installations on version 4 and higher of the Linux kernel, `overlay2` +is supported and preferred over `aufs`. Docker CE uses the `overlay2` +storage driver by default. If you need to use `aufs` instead, you need to +configure it manually. See [aufs](/engine/userguide/storagedriver/aufs-driver.md) ## Install Docker CE @@ -170,7 +134,7 @@ the repository. > 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 Rafaela`, you could use `trusty`. + > `Linux Mint Tessa`, you could use `bionic`.
    From 3f370fb51285b42036eca87809bc8cca193cd37c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Jan 2019 17:35:36 +0100 Subject: [PATCH 03/11] Remove Fedora 26, 27, and add Fedora 28 Fedora 26 and 27 are no longer supported, and no new packages are published for them. Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/fedora.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/linux/docker-ce/fedora.md b/install/linux/docker-ce/fedora.md index 00642ac815..b8da3b32f9 100644 --- a/install/linux/docker-ce/fedora.md +++ b/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 From 1f6e2aec0d2b9af791665dcd9f19d60ff3ec6886 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:01:58 +0100 Subject: [PATCH 04/11] Mention docker.io package as old name Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 4 ++-- install/linux/docker-ce/ubuntu.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index 861eba0591..ca6e6f94a7 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -34,8 +34,8 @@ Docker CE is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectu ### 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 diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index 3db26b449a..3fc9e39d5f 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -41,8 +41,8 @@ Docker CE is supported on `x86_64` (or `amd64`), `armhf`, `arm64`, `s390x` ### 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 From 6c77747b8e5662c47d78feeda00238769c9d396a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:13:03 +0100 Subject: [PATCH 05/11] Align instructions and wording between Ubuntu and Debian Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 41 ++++++++++++++++--------------- install/linux/docker-ce/ubuntu.md | 21 ++++++++-------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index ca6e6f94a7..aa38d8ce9b 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -77,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: @@ -89,17 +89,17 @@ from the repository. ```bash $ sudo apt-get install \ - apt-transport-https \ - ca-certificates \ - curl \ - gnupg2 \ - software-properties-common + apt-transport-https \ + ca-certificates \ + curl \ + gnupg2 \ + software-properties-common ``` 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 @@ -146,18 +146,20 @@ from the repository.
    ```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" ```
    ```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" ```
    @@ -199,7 +201,7 @@ 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 stretch/stable amd64 Packages + docker-ce | {{ site.docker_ce_stable_version }}.0~ce-0~debian | {{ download-url-base }} stretch/stable amd64 Packages ``` b. Install a specific version by its fully qualified package name, which is @@ -232,8 +234,8 @@ from the repository. 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). @@ -279,15 +281,15 @@ 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). #### 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 %} @@ -331,5 +333,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). diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index 3fc9e39d5f..b8992657f6 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -81,9 +81,9 @@ 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 from -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 +from the repository. #### Set up the repository @@ -102,6 +102,7 @@ the repository. apt-transport-https \ ca-certificates \ curl \ + gnupg2 \ software-properties-common ``` @@ -213,7 +214,6 @@ the repository. [Learn about **stable** and **edge** channels](/install/index.md). - #### Install Docker CE 1. Update the `apt` package index. @@ -250,7 +250,7 @@ the repository. `docker-ce=18.03.0~ce-0~ubuntu`. ```bash - $ sudo apt-get install docker-ce= + $ sudo apt-get install docker-ce= ``` The Docker daemon starts automatically. @@ -259,7 +259,7 @@ the repository. image. ```bash - $ sudo docker container run hello-world + $ sudo docker run hello-world ``` This command downloads a test image and runs it in a container. When the @@ -305,7 +305,7 @@ a new file each time you want to upgrade Docker CE. image. ```bash - $ sudo docker container run hello-world + $ sudo docker run hello-world ``` This command downloads a test image and runs it in a container. When the @@ -313,9 +313,9 @@ a new file each time you want to upgrade Docker CE. 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) to allow -non-privileged users to run Docker commands and for other optional configuration -steps. +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. #### Upgrade Docker CE @@ -345,5 +345,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). From 79857767c1013f858d832852615a461ef9f5be1a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:20:18 +0100 Subject: [PATCH 06/11] Use consistent wording for s390x and power Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/ubuntu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index b8992657f6..c1a22df99d 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -143,8 +143,8 @@ from the repository.
  • arm64
  • armhf
  • arm64
    • -
  • IBM Power (ppc64le)
    • -
  • IBM Z (s390x)
    • +
  • ppc64le (IBM Power)
    • +
  • s390x (IBM Z)
From 63e54ff85d309ce61ab07c6d23ef5c8dd409ad80 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:23:03 +0100 Subject: [PATCH 07/11] Fix instructions for arm64 being listed twice Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/ubuntu.md | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index c1a22df99d..e329e83702 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -140,9 +140,8 @@ from the repository. @@ -157,17 +156,7 @@ from the repository. ```
-
- - ```bash - $ sudo add-apt-repository \ - "deb [arch=arm64] {{ download-url-base }} \ - $(lsb_release -cs) \ - stable" - ``` - -
-
+
```bash $ sudo add-apt-repository \ @@ -177,7 +166,7 @@ from the repository. ```
-
+
```bash $ sudo add-apt-repository \ From d75ee56ee7f94528bde3b4c647589b5f06a95d1a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:53:37 +0100 Subject: [PATCH 08/11] Simplify instructions to install a specific version Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 20 +++++++++++--------- install/linux/docker-ce/ubuntu.md | 21 ++++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index aa38d8ce9b..4842d88465 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -201,13 +201,15 @@ from the repository. ```bash $ apt-cache madison docker-ce - docker-ce | {{ site.docker_ce_stable_version }}.0~ce-0~debian | {{ download-url-base }} stretch/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= @@ -252,10 +254,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`. diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index e329e83702..a3e695bb31 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -231,12 +231,15 @@ from the repository. ```bash $ apt-cache madison docker-ce - docker-ce | {{ site.docker_ce_stable_version }}.0~ce-0~ubuntu | {{ download-url-base }} xenial/stable amd64 Packages + docker-ce | 5:18.09.1~3-0~ubuntu-xenial | {{ download-url-base }} xenial/stable amd64 Packages + docker-ce | 5:18.09.0~3-0~ubuntu-xenial | {{ download-url-base }} xenial/stable amd64 Packages + docker-ce | 18.06.1~ce~3-0~ubuntu | {{ download-url-base }} xenial/stable amd64 Packages + docker-ce | 18.06.0~ce~3-0~ubuntu | {{ download-url-base }} xenial/stable amd64 Packages + ... ``` - b. Install a specific version by its fully qualified package name, which is - package name (`docker-ce`) "=" version string (2nd column), for example, - `docker-ce=18.03.0~ce-0~ubuntu`. + b. Install a specific version using the version string from the second column, + for example, `5:18.09.1~3-0~ubuntu-xenial`. ```bash $ sudo apt-get install docker-ce= @@ -270,12 +273,12 @@ to install. 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 CE. +a new file each time you want to upgrade Docker. -1. Go to [{{ download-url-base }}/dists/]({{ download-url-base }}/dists/), - choose your Ubuntu version, browse to `pool/stable/` and choose `amd64`, - `arm64`, `armhf`, `ppc64el`, or `s390x`. Download the `.deb` file for the - Docker version you want to install. +1. Go to [`{{ download-url-base }}/dists/`]({{ download-url-base }}/dists/){: target="_blank" class="_" }, + choose your Ubuntu version, browse to `pool/stable/`, choose `amd64`, + `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`. From ffab79562746bef66ff95491b7cf9cef5d07b628 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:55:01 +0100 Subject: [PATCH 09/11] Remove armhf/hello-world, because hello-world is multi-arch now Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index 4842d88465..b235e41cc7 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -220,18 +220,10 @@ from the repository. 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. From 2e78ea36503abe96bbd9fc5e9ce645cc3c355c51 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:56:42 +0100 Subject: [PATCH 10/11] Remove note about daemon starting automatically The next step already verifies that it's working, so this line is redundant. Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 2 -- install/linux/docker-ce/ubuntu.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index b235e41cc7..c3ed76d624 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -215,8 +215,6 @@ from the repository. $ sudo apt-get install docker-ce= ``` - The Docker daemon starts automatically. - 4. Verify that Docker CE is installed correctly by running the `hello-world` image. diff --git a/install/linux/docker-ce/ubuntu.md b/install/linux/docker-ce/ubuntu.md index a3e695bb31..2c5bec661d 100644 --- a/install/linux/docker-ce/ubuntu.md +++ b/install/linux/docker-ce/ubuntu.md @@ -245,8 +245,6 @@ from the repository. $ sudo apt-get install docker-ce= ``` - The Docker daemon starts automatically. - 4. Verify that Docker CE is installed correctly by running the `hello-world` image. From a68622b754fc60918229ad16877734724ca180a6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 03:15:51 +0100 Subject: [PATCH 11/11] Remove installation instructions for hypriot compose This page is meant to install the Docker Engine, not compose, and we should not direct users to non-official (and possibly outdated) versions of Docker Compose. Signed-off-by: Sebastiaan van Stijn --- install/linux/docker-ce/debian.md | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/install/linux/docker-ce/debian.md b/install/linux/docker-ce/debian.md index c3ed76d624..d6d08b026a 100644 --- a/install/linux/docker-ce/debian.md +++ b/install/linux/docker-ce/debian.md @@ -229,8 +229,7 @@ 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 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 @@ -276,8 +275,7 @@ 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) 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 @@ -286,24 +284,6 @@ To upgrade Docker CE, download the newer package file and repeat the {% 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: