From 6c77747b8e5662c47d78feeda00238769c9d396a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 12 Jan 2019 02:13:03 +0100 Subject: [PATCH] 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).