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

Puts parallel CE/EE instructions in tabs to shorten page (#2871) 

* Puts parallel CE/EE instructions in tabs to shorten page

* Removes some pre-tabs formatting
This commit is contained in:
Jesse Adametz 2017-04-18 17:42:02 -05:00 committed by John Mulhausen
parent 7245c83c17
commit 6f0f24f1bf
1 changed files with 171 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
engine/installation/linux/ubuntu.md
View File

@ -93,11 +93,15 @@ the repository.
#### Set up the repository
The procedure for setting up the repository is different for [Docker CE](#docker-ce) and
[Docker EE](#docker-ee).
##### Docker CE
The procedure for setting up the repository is different for Docker CE and
Docker EE.
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" data-group="ce" data-target="#ce-repo-setup">Docker CE</a></li>
<li><a data-toggle="tab" data-group="ee" data-target="#ee-repo-setup">Docker EE</a></li>
</ul>
<div class="tab-content">
<div id="ce-repo-setup" class="tab-pane fade in active" markdown="1">
{% assign download-url-base = "https://download.docker.com/linux/ubuntu" %}
1. Install packages to allow `apt` to use a repository over HTTPS:
@ -158,9 +162,8 @@ The procedure for setting up the repository is different for [Docker CE](#docker
```
[Learn about **stable** and **edge** channels](/engine/installation/).
##### Docker EE
</div>
<div id="ee-repo-setup" class="tab-pane fade" markdown="1">
1. Install packages to allow `apt` to use a repository over HTTPS:
```bash
@ -202,6 +205,8 @@ The procedure for setting up the repository is different for [Docker CE](#docker
$(lsb_release -cs) \
stable-{{ minor-version }}"
```
</div>
</div>
#### Install Docker
@ -216,10 +221,26 @@ The procedure for setting up the repository is different for [Docker CE](#docker
Use this command to install the latest version of Docker:
| Docker Edition | Command |
|----------------|-------------------------------------|
| Docker CE | `sudo apt-get install docker-ce` |
| Docker EE | `sudo apt-get install docker-ee` |
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" data-group="ce" data-target="#ce-install-docker">Docker CE</a></li>
<li><a data-toggle="tab" data-group="ee" data-target="#ee-install-docker">Docker EE</a></li>
</ul>
<div class="tab-content">
<div id="ce-install-docker" class="tab-pane fade in active" markdown="1">
```bash
$ sudo apt-get install docker-ce
```
</div>
<div id="ee-install-docker" class="tab-pane fade" markdown="1">
```bash
$ sudo apt-get install docker-ee
```
</div>
</div>
> **Warning**: If you have multiple Docker repositories enabled, installing
@ -246,10 +267,26 @@ The procedure for setting up the repository is different for [Docker CE](#docker
by extension its stability level. To install a specific version, append the
version string to the package name and separate them by an equals sign (`=`):
| Docker Edition | Command |
|----------------|-----------------------------------------------|
| Docker CE | `sudo apt-get install docker-ce=<VERSION>` |
| Docker EE | `sudo apt-get install docker-ee=<VERSION>` |
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" data-group="ce" data-target="#ce-install-version-docker">Docker CE</a></li>
<li><a data-toggle="tab" data-group="ee" data-target="#ee-install-version-docker">Docker EE</a></li>
</ul>
<div class="tab-content">
<div id="ce-install-version-docker" class="tab-pane fade in active" markdown="1">
```bash
$ sudo apt-get install docker-ce=<VERSION>
```
</div>
<div id="ee-install-version-docker" class="tab-pane fade" markdown="1">
```bash
$ sudo apt-get install docker-ee=<VERSION>
```
</div>
</div>
The Docker daemon starts automatically.
@ -282,8 +319,14 @@ 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 }}/dists/]({{ download-url-base }}/dists/), choose your
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" data-group="ce" data-target="#ce-install-from-package-docker">Docker CE</a></li>
<li><a data-toggle="tab" data-group="ee" data-target="#ee-install-from-package-docker">Docker EE</a></li>
</ul>
<div class="tab-content">
<div id="ce-install-from-package-docker" class="tab-pane fade in active" markdown="1">
Go to [{{ download-url-base }}/dists/]({{ download-url-base }}/dists/), choose your
Ubuntu version, browse to `stable/pool/stable/`, choose either `amd64` or
`armhf`,and download the `.deb` file for the Docker version you want to
install and for your version of Ubuntu.
@ -292,11 +335,17 @@ a new file each time you want to upgrade Docker.
> `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
</div>
<div id="ee-install-from-package-docker" class="tab-pane fade" markdown="1">
Go to the Docker EE repository URL associated with your
trial or subscription in your browser. Go to
`x86_64/stable-{{ minor-version }}` and download the `.deb` file for the
Docker version you want to install.
</div>
</div>
2. Install Docker, changing the path below to the path where you downloaded
the Docker package.
@ -330,10 +379,26 @@ To upgrade Docker, download the newer package file and repeat the
1. Uninstall the Docker package:
| Docker Edition | Command |
|----------------|--------------------------------|
| Docker CE | `sudo apt-get purge docker-ce` |
| Docker EE | `sudo apt-get purge docker-ee` |
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" data-group="ce" data-target="#ce-uninstall-version-docker">Docker CE</a></li>
<li><a data-toggle="tab" data-group="ee" data-target="#ee-uninstall-version-docker">Docker EE</a></li>
</ul>
<div class="tab-content">
<div id="ce-uninstall-version-docker" class="tab-pane fade in active" markdown="1">
```bash
$ sudo apt-get purge docker-ce
```
</div>
<div id="ee-uninstall-version-docker" class="tab-pane fade" markdown="1">
```bash
$ sudo apt-get purge docker-ee
```
</div>
</div>
2. Images, containers, volumes, or customized configuration files on your host
are not automatically removed. To delete all images, containers, and