docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align instructions and wording between Ubuntu and Debian 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-01-12 02:13:03 +01:00
parent 1f6e2aec0d
commit 6c77747b8e
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
install/linux/docker-ce/debian.md
View File

@ -77,7 +77,7 @@ from the repository.
#### Set up 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: 1. Update the `apt` package index:
@ -89,17 +89,17 @@ from the repository.
```bash ```bash
$ sudo apt-get install \ $ sudo apt-get install \
apt-transport-https \ apt-transport-https \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg2 \ gnupg2 \
software-properties-common software-properties-common
``` ```
3. Add Docker's official GPG key: 3. Add Docker's official GPG key:
```bash ```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 Verify that you now have the key with the fingerprint
@ -146,18 +146,20 @@ from the repository.
<div id="armhf_repo" class="tab-pane fade" markdown="1"> <div id="armhf_repo" class="tab-pane fade" markdown="1">
```bash ```bash
$ echo "deb [arch=armhf] {{ download-url-base }} \ $ sudo add-apt-repository \
$(lsb_release -cs) stable" | \ "deb [arch=armhf] {{ download-url-base }} \
sudo tee /etc/apt/sources.list.d/docker.list $(lsb_release -cs) \
stable"
``` ```
</div> </div>
<div id="arm64_repo" class="tab-pane fade" markdown="1"> <div id="arm64_repo" class="tab-pane fade" markdown="1">
```bash ```bash
$ echo "deb [arch=arm64] {{ download-url-base }} \ $ sudo add-apt-repository \
$(lsb_release -cs) stable" | \ "deb [arch=arm64] {{ download-url-base }} \
sudo tee /etc/apt/sources.list.d/docker.list $(lsb_release -cs) \
stable"
``` ```
</div> </div>
@ -199,7 +201,7 @@ from the repository.
```bash ```bash
$ apt-cache madison docker-ce $ 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 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. container runs, it prints an informational message and exits.
Docker CE is installed and running. The `docker` group is created but no users 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 are added to it. You need to use `sudo` to run Docker commands.
commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow
non-privileged users to run Docker commands and for other optional configuration non-privileged users to run Docker commands and for other optional configuration
steps. For Raspbian, you can optionally steps. For Raspbian, you can optionally
[install Docker Compose for Raspbian](#install-docker-compose-for-raspbian). [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. container runs, it prints an informational message and exits.
Docker CE is installed and running. The `docker` group is created but no users 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 are added to it. You need to use `sudo` to run Docker commands.
commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) 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 to allow non-privileged users to run Docker commands and for other optional
configuration steps. For Raspbian, you can optionally configuration steps. For Raspbian, you can optionally
[install Docker Compose for Raspbian](#install-docker-compose-for-raspbian). [install Docker Compose for Raspbian](#install-docker-compose-for-raspbian).
#### Upgrade Docker CE #### 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. [installation procedure](#install-from-a-package), pointing to the new file.
{% include install-script.md %} {% include install-script.md %}
@ -331,5 +333,4 @@ You must delete any edited configuration files manually.
## Next steps ## Next steps
- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
- Continue with the [User Guide](/engine/userguide/index.md). - Continue with the [User Guide](/engine/userguide/index.md).

21
install/linux/docker-ce/ubuntu.md
View File

@ -81,9 +81,9 @@ You can install Docker CE in different ways, depending on your needs:
### Install using the repository ### Install using the repository
Before you install Docker CE for the first time on a new host machine, you need to Before you install Docker CE for the first time on a new host machine, you need
set up the Docker repository. Afterward, you can install and update Docker from to set up the Docker repository. Afterward, you can install and update Docker
the repository. from the repository.
#### Set up the repository #### Set up the repository
@ -102,6 +102,7 @@ the repository.
apt-transport-https \ apt-transport-https \
ca-certificates \ ca-certificates \
curl \ curl \
gnupg2 \
software-properties-common software-properties-common
``` ```
@ -213,7 +214,6 @@ the repository.
[Learn about **stable** and **edge** channels](/install/index.md). [Learn about **stable** and **edge** channels](/install/index.md).
#### Install Docker CE #### Install Docker CE
1. Update the `apt` package index. 1. Update the `apt` package index.
@ -250,7 +250,7 @@ the repository.
`docker-ce=18.03.0~ce-0~ubuntu`. `docker-ce=18.03.0~ce-0~ubuntu`.
```bash ```bash
$ sudo apt-get install docker-ce=<VERSION> $ sudo apt-get install docker-ce=<VERSION_STRING>
``` ```
The Docker daemon starts automatically. The Docker daemon starts automatically.
@ -259,7 +259,7 @@ the repository.
image. image.
```bash ```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 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. image.
```bash ```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 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 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. 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 Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
non-privileged users to run Docker commands and for other optional configuration to allow non-privileged users to run Docker commands and for other optional
steps. configuration steps.
#### Upgrade Docker CE #### Upgrade Docker CE
@ -345,5 +345,4 @@ You must delete any edited configuration files manually.
## Next steps ## Next steps
- Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md) - Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
- Continue with the [User Guide](/engine/userguide/index.md). - Continue with the [User Guide](/engine/userguide/index.md).