diff --git a/_data/toc.yaml b/_data/toc.yaml index 21f720ef3a..f422e6b861 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -52,6 +52,12 @@ guides: title: Fedora - path: /engine/installation/linux/docker-ce/binaries/ title: Binaries + - sectiontitle: Platforms supporting Docker EE and Docker CE + section: + - path: /engine/installation/linux/centos/ + title: CentOS + - path: /engine/installation/linux/ubuntu/ + title: Ubuntu - path: /engine/installation/linux/linux-postinstall/ title: Optional Linux post-installation steps - sectiontitle: Docker Edge diff --git a/_includes/docker_platform_matrix.md b/_includes/docker_platform_matrix.md index e3c05560c9..46282089e2 100644 --- a/_includes/docker_platform_matrix.md +++ b/_includes/docker_platform_matrix.md @@ -1,12 +1,12 @@ {% assign green-check = '![yes](/engine/installation/images/green-check.svg){: style="height: 14px; margin: 0 auto"}' %} {% assign install-prefix = '/engine/installation/linux' %} -| Platform | Docker CE x86_64 | Docker CE ARM | Docker EE | -|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------| -| [CentOS]({{ install-prefix }}/centos.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md) | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos.md) | -| [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | | -| [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md) | | | -| [Microsoft Windows Server 2016](/engine/installation/windows/docker-ee.md) | | | [{{ green-check }}](/engine/installation/windows/docker-ee.md) | -| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md) | -| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | -| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | -| [Ubuntu]({{ install-prefix }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | +| Platform | Docker CE x86_64 | Docker CE ARM | Docker CE System Z (s390x) | Docker EE | +|:---------------------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:--------------------------------------------------------------|:---------------------------------------------------------------| +| [CentOS]({{ install-prefix }}/centos.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/centos.md) | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/centos.md) | +| [Debian]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/debian.md) | | | +| [Fedora]({{ install-prefix }}/docker-ce/fedora.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/fedora.md) | | | | +| [Microsoft Windows Server 2016](/engine/installation/windows/docker-ee.md) | | | | [{{ green-check }}](/engine/installation/windows/docker-ee.md) | +| [Oracle Linux]({{ install-prefix }}/docker-ee/oracle.md) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/oracle.md) | +| [Red Hat Enterprise Linux]({{ install-prefix }}/docker-ee/rhel.md) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/rhel.md) | +| [SUSE Linux Enterprise Server]({{ install-prefix }}/docker-ee/suse.md) | | | | [{{ green-check }}]({{ install-prefix }}/docker-ee/suse.md) | +| [Ubuntu]({{ install-prefix }}/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ce/ubuntu.md) | [{{ green-check }}]({{ install-prefix }}/docker-ee/ubuntu.md) | diff --git a/_includes/install-script.md b/_includes/install-script.md new file mode 100644 index 0000000000..9992d6baf6 --- /dev/null +++ b/_includes/install-script.md @@ -0,0 +1,66 @@ + + +### Install using the convenience script + +Docker provides convenience scripts at [get.docker.com](https://get.docker.com/) +and [test.docker.com](https://test.docker.com/) for installing stable and +testing versions of Docker CE into development environments quickly and +non-interactively. The source code for the scripts is in the +[`docker-install` repository](https://github.com/docker/docker-install). +**Using these scripts is not recommended for production +environments**, and you should understand the potential risks before you use +them: + +- The scripts require `root` or `sudo` privileges in order to run. Therefore, + you should carefully examine and audit the scripts before running them. +- The scripts attempt to detect your Linux distribution and version and + configure your package management system for you. In addition, the scripts do + not allow you to customize any installation parameters. This may lead to an + unsupported configuration, either from Docker's point of view or from your own + organization's guidelines and standards. +- The scripts install all dependencies and recommendations of the package + manager without asking for confirmation. This may install a large number of + packages, depending on the current configuration of your host machine. +- Do not use the convenience script if Docker has already been installed on the + host machine using another mechanism. + +This example uses the script at [get.docker.com](https://get.docker.com/) to +install the latest stable release of Docker CE on Linux. To install the latest +testing version, use [test.docker.com](https://test.docker.com/) instead. In +each of the commands below, replace each occurrence of `get` with `test`. + +> **Warning**: Always examine scripts downloaded from the internet before +> running them locally. +{:.warning-vanilla} + +```bash +$ curl -fsSL get.docker.com -o get-docker.sh +$ sudo sh get-docker.sh + + + +If you would like to use Docker as a non-root user, you should now consider +adding your user to the "docker" group with something like: + + sudo usermod -aG docker your-user + +Remember that you will have to log out and back in for this to take effect! + +WARNING: Adding a user to the "docker" group will grant the ability to run + containers which can be used to obtain root privileges on the + docker host. + Refer to https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface + for more information. +``` + +Docker CE is installed. It starts automatically on `DEB`-based distributions. On +`RPM`-based distributions, you need to start it manually using the appropriate +`systemctl` or `service` command. As the message indicates, non-root users are +not able to run Docker commands by default. + +#### Upgrade Docker after using the convenience script + +If you installed Docker using the convenience script, you should upgrade Docker +using your package manager directly. There is no advantage to re-running the +convenience script, and it can cause issues if it attempts to re-add +repositories which have already been added to the host machine. diff --git a/engine/installation/linux/centos.md b/engine/installation/linux/centos.md index 0cad8ad0de..5e42f80683 100644 --- a/engine/installation/linux/centos.md +++ b/engine/installation/linux/centos.md @@ -4,7 +4,8 @@ title: Choose Docker CE or Docker EE on CentOS --- The instructions for installing Docker on CentOS depend on whether you are using -Docker EE or Docker CE. +Docker Enterprise Edition (Docker EE) or Docker Community Edition (Docker CE). +[Learn more about Docker EE and Docker CE](/engine/installation/). - [Install Docker EE on CentOS](/engine/installation/linux/docker-ee/centos.md) - [Install Docker CE on CentOS](/engine/installation/linux/docker-ce/centos.md) diff --git a/engine/installation/linux/docker-ce/binaries.md b/engine/installation/linux/docker-ce/binaries.md index 46dc938b0c..9d475dac89 100644 --- a/engine/installation/linux/docker-ce/binaries.md +++ b/engine/installation/linux/docker-ce/binaries.md @@ -72,23 +72,19 @@ instructions for enabling and configuring AppArmor or SELinux. ### Install static binaries -1. Download the static binary archive. You can download either the latest - release binaries or a specific version. To find the download link, see the - [release notes](https://github.com/moby/moby/releases) for the version - of Docker you want to install. You can choose a `tar.gz` archive or `zip` - archive. +1. Download the static binary archive. Go to + [https://download.docker.com/linux/static/stable/](https://download.docker.com/linux/static/stable/x86_64/) + (or change `stable` to `edge` or `test`), + choose your hardware platform, and download the `.tgz` file relating to the + version of Docker CE you want to install. -2. Extract the archive using `tar` or `unzip`, depending on the format you - downloaded. The `dockerd` and `docker` binaries are extracted. +2. Extract the archive using the `tar` utility. The `dockerd` and `docker` + binaries are extracted. ```bash $ tar xzvf /path/to/.tar.gz ``` - ```bash - $ unzip /path/to/.zip - ``` - 3. **Optional**: Move the binaries to a directory on your executable path, such as `/usr/bin/`. If you skip this step, you must provide the path to the executable when you invoke `docker` or `dockerd` commands. @@ -104,7 +100,8 @@ instructions for enabling and configuring AppArmor or SELinux. ``` If you need to start the daemon with additional options, modify the above - command accordingly. + command accordingly or create and edit the file `/etc/docker/daemon.json` + to add the custom configuration options. 5. Verify that Docker is installed correctly by running the `hello-world` image. @@ -127,23 +124,20 @@ instructions for enabling and configuring AppArmor or SELinux. The macOS binary includes the Docker client only. It does not include the `dockerd` daemon. -1. Download the static binary archive. You can download either the latest - release binaries or a specific version. To find the download link, see the - [release notes](https://github.com/moby/moby/releases) for the version - of Docker you want to install. You can choose a `tar.gz` archive or - `zip` archive. +1. Download the static binary archive. Go to + [https://download.docker.com/mac/static/stable/x86_64/](https://download.docker.com/mac/static/stable/x86_64/), + (or change `stable` to `edge` or `test`), + and download the `.tgz` file relating to the version of Docker CE you want + to install. -2. Extract the archive using `tar` or `unzip`, depending on the format you - downloaded. The `docker` binary is extracted. +2. Extract the archive using the `tar` utility. The `docker` binary is + extracted. ```bash $ tar xzvf /path/to/.tar.gz ``` - ```bash - $ unzip /path/to/.zip - ``` -3. **Optional**: Move the binaries to a directory on your executable path, such +3. **Optional**: Move the binary to a directory on your executable path, such as `/usr/local/bin/`. If you skip this step, you must provide the path to the executable when you invoke `docker` or `dockerd` commands. @@ -152,7 +146,8 @@ The macOS binary includes the Docker client only. It does not include the ``` 4. Verify that Docker is installed correctly by running the `hello-world` - image. + image. The value of `` is a hostname or IP address running the + Docker daemon and accessible to the client. ```bash $ sudo docker -H run hello-world @@ -164,24 +159,21 @@ The macOS binary includes the Docker client only. It does not include the ## Install server and client binaries on Windows -You can install Docker from binaries on Windows Server 2016 or Windows 10. - -- To install both client and server binaries, download the 64-bit binary. The - archive includes `x86_64` in the path. - -- To install the client only, download the 32-bit binary. The archive includes - `i386` in the path. +You can install Docker from binaries on Windows Server 2016 or Windows 10. Both +the `dockerd.exe` and `docker.exe` binaries are included. 1. Use the following PowerShell commands to install and start Docker: ```none - Invoke-WebRequest https://get.docker.com/builds/Windows/x86_64/docker-{{ minor-version }}.0-ce.zip -UseBasicParsing -OutFile docker.zip - Expand-Archive docker.zip -DestinationPath $Env:ProgramFiles - Remove-Item -Force docker.zip + PS C:\> Invoke-WebRequest https://download.docker.com/win/static/stable/x86_64//docker-{{ minor-version }}.0-ce.zip -UseBasicParsing -OutFile docker.zip - dockerd --register-service + PS C:\> Expand-Archive docker.zip -DestinationPath $Env:ProgramFiles - Start-Service docker + PS C:\> Remove-Item -Force docker.zip + + PS C:\> dockerd --register-service + + PS C:\> Start-Service docker ``` 2. Verify that Docker is installed correctly by running the `hello-world` @@ -189,7 +181,7 @@ You can install Docker from binaries on Windows Server 2016 or Windows 10. ```none - docker run hello-world:nanoserver + PS C:\> docker run hello-world:nanoserver ``` This command downloads a test image and runs it in a container. When the @@ -197,10 +189,10 @@ You can install Docker from binaries on Windows Server 2016 or Windows 10. ## Upgrade static binaries -To upgrade your manual installation of Docker Engine on Linux, first stop any -`dockerd` processes running locally, then follow the -[regular installation steps](#get-the-linux-binaries), overwriting any existing -`dockerd` or `docker` binaries with the newer versions. +To upgrade your manual installation of Docker CE, first stop any +`dockerd` or `dockerd.exe` processes running locally, then follow the +regular installation steps to install the new version on top of the existing +version. ## Next steps diff --git a/engine/installation/linux/docker-ce/centos.md b/engine/installation/linux/docker-ce/centos.md index 6cdafc9f13..195759b23f 100644 --- a/engine/installation/linux/docker-ce/centos.md +++ b/engine/installation/linux/docker-ce/centos.md @@ -53,10 +53,14 @@ You can install Docker CE in different ways, depending on your needs: from them, for ease of installation and upgrade tasks. This is the recommended approach. -- Some users download the RPM package and install it manually and manage +- Some users download the RPM package and + [install it manually](#install-from-a-package) and manage upgrades completely manually. This is useful in situations such as installing Docker on air-gapped systems with no access to the internet. +- In testing and development environments, some users choose to use automated + [convenience scripts](#install-using-the-convenience-script) to install Docker. + ### Install using the repository Before you install Docker CE for the first time on a new host machine, you need @@ -135,6 +139,7 @@ from the repository. > or updating without specifying a version in the `yum install` or > `yum update` command will always install the highest possible version, > which may not be appropriate for your stability needs. + {:.warning-vanilla} 3. On production systems, you should install a specific version of Docker CE instead of always using the latest. List the available versions. This @@ -237,6 +242,8 @@ To upgrade Docker CE, download the newer package file and repeat the [installation procedure](#install-from-a-package), using `yum -y upgrade` instead of `yum -y install`, and pointing to the new file. +{% include install-script.md %} + ## Uninstall Docker CE 1. Uninstall the Docker package: diff --git a/engine/installation/linux/docker-ce/debian.md b/engine/installation/linux/docker-ce/debian.md index 576f0d6827..44396a655f 100644 --- a/engine/installation/linux/docker-ce/debian.md +++ b/engine/installation/linux/docker-ce/debian.md @@ -71,10 +71,14 @@ You can install Docker CE in different ways, depending on your needs: from them, for ease of installation and upgrade tasks. This is the recommended approach. -- Some users download the DEB package and install it manually and manage +- Some users download the DEB package and + [install it manually](#install-from-a-package) and manage upgrades completely manually. This is useful in situations such as installing Docker on air-gapped systems with no access to the internet. +- In testing and development environments, some users choose to use automated + [convenience scripts](#install-using-the-convenience-script) to install Docker. + ### Install using the repository Before you install Docker CE for the first time on a new host machine, you need @@ -356,7 +360,7 @@ 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. You need to use `sudo` to run Docker -commands. Continue to [Post-installation steps for Linux](linux-postinstall.md) +commands. Continue to [Post-installation steps for Linux](/engine/installation/linux/linux-postinstall.md) to allow non-privileged users to run Docker commands and for other optional configuration steps. @@ -365,6 +369,8 @@ configuration steps. To upgrade Docker, download the newer package file and repeat the [installation procedure](#install-from-a-package), pointing to the new file. +{% include install-script.md %} + ## Uninstall Docker CE 1. Uninstall the Docker CE package: diff --git a/engine/installation/linux/docker-ce/fedora.md b/engine/installation/linux/docker-ce/fedora.md index f63d027da3..f1734f926a 100644 --- a/engine/installation/linux/docker-ce/fedora.md +++ b/engine/installation/linux/docker-ce/fedora.md @@ -55,10 +55,14 @@ You can install Docker CE in different ways, depending on your needs: from them, for ease of installation and upgrade tasks. This is the recommended approach. -- Some users download the RPM package and install it manually and manage +- Some users download the RPM package and + [install it manually](#install-from-a-package) and manage upgrades completely manually. This is useful in situations such as installing Docker on air-gapped systems with no access to the internet. +- In testing and development environments, some users choose to use automated + [convenience scripts](#install-using-the-convenience-script) to install Docker. + ### Install using the repository Before you install Docker CE for the first time on a new host machine, you need @@ -241,6 +245,8 @@ To upgrade Docker CE, download the newer package file and repeat the [installation procedure](#install-from-a-package), using `dnf -y upgrade` instead of `dnf -y install`, and pointing to the new file. +{% include install-script.md %} + ## Uninstall Docker CE 1. Uninstall the Docker package: diff --git a/engine/installation/linux/docker-ce/ubuntu.md b/engine/installation/linux/docker-ce/ubuntu.md index 6c5c815f68..3efe973798 100644 --- a/engine/installation/linux/docker-ce/ubuntu.md +++ b/engine/installation/linux/docker-ce/ubuntu.md @@ -79,10 +79,14 @@ You can install Docker CE in different ways, depending on your needs: from them, for ease of installation and upgrade tasks. This is the recommended approach. -- Some users download the DEB package and install it manually and manage +- Some users download the DEB package and + [install it manually](#install-from-a-package) and manage upgrades completely manually. This is useful in situations such as installing Docker on air-gapped systems with no access to the internet. +- In testing and development environments, some users choose to use automated + [convenience scripts](#install-using-the-convenience-script) to install Docker. + ### Install using the repository Before you install Docker CE for the first time on a new host machine, you need to @@ -282,6 +286,8 @@ steps. 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 %} + ## Uninstall Docker CE 1. Uninstall the Docker CE package: diff --git a/engine/installation/linux/docker-ee/centos.md b/engine/installation/linux/docker-ee/centos.md index f9c297ac0e..a1285ac93d 100644 --- a/engine/installation/linux/docker-ee/centos.md +++ b/engine/installation/linux/docker-ee/centos.md @@ -19,7 +19,9 @@ Docker CE users should go to **instead of this topic**. To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE -repository URL associated with your trial or subscription. To get this information: +repository URL associated with your trial or subscription. These instructions +work for Docker EE for CentOS and for Docker EE for Linux, which includes access +to Docker EE for all Linux distributions.To get this information: - Go to [https://store.docker.com/my-content](https://store.docker.com/my-content). - Choose **Get Details** / **Setup Instructions** within the @@ -88,7 +90,7 @@ EE from the repository. [prerequisites](#prerequisites). ```bash - $ sudo sh -c 'echo "" > /etc/yum/vars/dockerurl' + $ sudo sh -c 'echo "/centos" > /etc/yum/vars/dockerurl' ``` 3. Install required packages. `yum-utils` provides the `yum-config-manager` @@ -104,7 +106,7 @@ EE from the repository. ```bash $ sudo yum-config-manager \ --add-repo \ - /docker-ee.repo + /centos/docker-ee.repo ``` #### Install Docker EE @@ -128,12 +130,11 @@ EE from the repository. $ sudo yum install docker-ee ``` - > **Warning**: - > If you have multiple Docker repositories enabled, installing + > **Warning**: If you have multiple Docker repositories enabled, installing > or updating without specifying a version in the `yum install` or > `yum update` command will always install the highest possible version, > which may not be appropriate for your stability needs. - {:.warning} + {:.warning-vanilla} 3. On production systems, you should install a specific version of Docker EE instead of always using the latest. List the available versions. This @@ -210,8 +211,8 @@ a new file each time you want to upgrade Docker. 1. Go to the Docker EE repository URL associated with your trial or subscription in your browser. Go to - `7/x86_64/stable-{{ minor-version }}/Packages/` and download the `.rpm` - file for the Docker version you want to install. + `centos/7/x86_64/stable-{{ minor-version }}/Packages/` and download the + `.rpm` file for the Docker version you want to install. 2. Install Docker EE, changing the path below to the path where you downloaded the Docker EE package. diff --git a/engine/installation/linux/docker-ee/oracle.md b/engine/installation/linux/docker-ee/oracle.md index cb0a84c847..0040bb4aae 100644 --- a/engine/installation/linux/docker-ee/oracle.md +++ b/engine/installation/linux/docker-ee/oracle.md @@ -18,7 +18,9 @@ Docker Community Edition (Docker CE) is not supported on Oracle Linux. ### Docker EE repository URL To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE -repository URL associated with your trial or subscription. To get this information: +repository URL associated with your trial or subscription. These instructions +work for Docker EE for Oracle Linux and for Docker EE for Linux, which includes +access to Docker EE for all Linux distributions.To get this information: - Go to [https://store.docker.com/my-content](https://store.docker.com/my-content). - Choose **Get Details** / **Setup Instructions** within the @@ -49,8 +51,8 @@ installed, uninstall them, along with associated dependencies. ```bash $ sudo yum remove docker \ - docker-engine - docker-engine-selinux \ + docker-engine \ + docker-engine-selinux ``` It's OK if `yum` reports that none of these packages are installed. @@ -86,7 +88,7 @@ from the repository. [prerequisites](#prerequisites). ```bash - $ sudo sh -c 'echo "" > /etc/yum/vars/dockerurl' + $ sudo sh -c 'echo "/oraclelinux" > /etc/yum/vars/dockerurl' ``` 3. Install required packages. `yum-utils` provides the `yum-config-manager` @@ -94,7 +96,7 @@ from the repository. `devicemapper` storage driver. ```bash - $ sudo yum install -y yum-utils device-mapper-persistent-data lvm2 + $ sudo yum install -y yum-utils device-mapper-persistent-data lvm2 container-selinux ``` 4. Use the following command to add the **stable** repository: @@ -102,7 +104,7 @@ from the repository. ```bash $ sudo yum-config-manager \ --add-repo \ - /docker-ee.repo + /oraclelinux/docker-ee.repo ``` #### Install Docker EE @@ -202,8 +204,8 @@ need to download a new file each time you want to upgrade Docker EE. 1. Go to the Docker EE repository URL associated with your trial or subscription in your browser. Browse to - `7/x86_64/stable-{{ minor-version }}/Packages` and download the `.rpm` file - for the Docker version you want to install. + `oraclelinux/7/x86_64/stable-{{ minor-version }}/Packages` and download the + `.rpm` file for the Docker version you want to install. 2. Install Docker EE, changing the path below to the path where you downloaded the Docker package. diff --git a/engine/installation/linux/docker-ee/rhel.md b/engine/installation/linux/docker-ee/rhel.md index 06836476eb..d33306573e 100644 --- a/engine/installation/linux/docker-ee/rhel.md +++ b/engine/installation/linux/docker-ee/rhel.md @@ -19,7 +19,9 @@ Docker Community Edition (Docker CE) is not supported on RHEL. ### Docker EE repository URL To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE -repository URL associated with your trial or subscription. To get this information: +repository URL associated with your trial or subscription. These instructions +work for Docker EE for RHEL and for Docker EE for Linux, which includes access +to Docker EE for all Linux distributions. To get this information: - Go to [https://store.docker.com/my-content](https://store.docker.com/my-content). - Choose **Get Details** / **Setup Instructions** within the @@ -89,7 +91,7 @@ from the repository. [prerequisites](#prerequisites). ```bash - $ sudo sh -c 'echo "" > /etc/yum/vars/dockerurl' + $ sudo sh -c 'echo "/rhel" > /etc/yum/vars/dockerurl' ``` - Store your RHEL version string in `/etc/yum/vars/dockerosversion`. @@ -143,7 +145,7 @@ from the repository. ```bash $ sudo yum-config-manager \ --add-repo \ - /docker-ee.repo + /rhel/docker-ee.repo ``` #### Install Docker EE @@ -244,8 +246,8 @@ need to download a new file each time you want to upgrade Docker EE. 1. Go to the Docker EE repository URL associated with your trial or subscription in your browser. Go to - `7/x86_64/stable-{{ minor-version }}/Packages` and download the `.rpm` file - for the Docker version you want to install. + `rhel/7/x86_64/stable-{{ minor-version }}/Packages` and download the `.rpm` + file for the Docker version you want to install. > **Note**: If you have trouble with `selinux` using the packages under the > `7` directory, try choosing the version-specific directory instead, such diff --git a/engine/installation/linux/docker-ee/suse.md b/engine/installation/linux/docker-ee/suse.md index 1097c431cb..a4a28ebc68 100644 --- a/engine/installation/linux/docker-ee/suse.md +++ b/engine/installation/linux/docker-ee/suse.md @@ -18,7 +18,9 @@ To get started with Docker on SUSE Linux Enterprise Server (SLES), make sure you ### Docker EE URL To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE -repository URL associated with your trial or subscription. To get this information: +repository URL associated with your trial or subscription. These instructions +work for Docker EE for SLES and for Docker EE for Linux, which includes access +to Docker EE for all Linux distributions. To get this information: - Go to [https://store.docker.com/my-content](https://store.docker.com/my-content). - Choose **Get Details** / **Setup Instructions** within the @@ -118,14 +120,14 @@ from the repository. ```bash $ sudo zypper addrepo \ - /12.3/x86_64/stable-{{ minor-version }} \ + /sles/12.3/x86_64/stable-{{ minor-version }} \ docker-ee-stable ``` 2. Import the GPG key from the repository. ```bash - $ sudo rpm --import /gpg + $ sudo rpm --import /sles/gpg ``` 3. Install Docker EE, changing the path below to the path where you downloaded diff --git a/engine/installation/linux/docker-ee/ubuntu.md b/engine/installation/linux/docker-ee/ubuntu.md index c46b6af2dd..ffb70d4dc7 100644 --- a/engine/installation/linux/docker-ee/ubuntu.md +++ b/engine/installation/linux/docker-ee/ubuntu.md @@ -21,7 +21,9 @@ Docker CE users should go to **instead of this topic**. To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE -repository URL associated with your trial or subscription. To get this information: +repository URL associated with your trial or subscription. These instructions +work for Docker EE for Ubuntu and for Docker EE for Linux, which includes access +to Docker EE for all Linux distributions. To get this information: - Go to [https://store.docker.com/my-content](https://store.docker.com/my-content). - Choose **Get Details** / **Setup Instructions** within the @@ -113,13 +115,13 @@ from the repository. 3. Add Docker's official GPG key using your customer Docker EE repository URL: ```bash - $ curl -fsSL /gpg | sudo apt-key add - + $ curl -fsSL /ubuntu/gpg | sudo apt-key add - ``` Verify that the key fingerprint is `DD91 1E99 5A64 A202 E859 07D6 BC14 F10B 6D08 5F96`. ```bash - $ apt-key fingerprint 0EBFCD88 + $ apt-key fingerprint 6D085F96 pub 4096R/6D085F96 2017-02-22 Key fingerprint = DD91 1E99 5A64 A202 E859 07D6 BC14 F10B 6D08 5F96 @@ -137,7 +139,7 @@ from the repository. ```bash $ sudo add-apt-repository \ - "deb [arch=amd64] \ + "deb [arch=amd64] /ubuntu \ $(lsb_release -cs) \ stable-{{ minor-version }}" ``` @@ -159,12 +161,11 @@ from the repository. $ sudo apt-get install docker-ee ``` - > **Warning**: - > If you have multiple Docker repositories enabled, installing + > **Warning**: If you have multiple Docker repositories enabled, installing > or updating without specifying a version in the `apt-get install` or > `apt-get update` command will always install the highest possible version, > which may not be appropriate for your stability needs. - {:.warning} + {:.warning-vanilla} 3. On production systems, you should install a specific version of Docker EE instead of always using the latest. This output is truncated. List the @@ -173,7 +174,7 @@ from the repository. ```bash $ apt-cache madison docker-ee - docker-ee | {{ minor-version }}.0~ee-0~ubuntu-xenial | {{ download-url-base}} xenial/stable amd64 Packages + docker-ee | {{ minor-version }}.0~ee-0~ubuntu-xenial | /ubuntu xenial/stable amd64 Packages ``` The contents of the list depend upon which repositories are enabled, @@ -219,7 +220,7 @@ a new file each time you want to upgrade Docker EE. 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 + `ubuntu/x86_64/stable-{{ minor-version }}` and download the `.deb` file for the Docker EE version you want to install. 2. Install Docker EE, changing the path below to the path where you downloaded diff --git a/engine/installation/linux/ubuntu.md b/engine/installation/linux/ubuntu.md index 969063a189..5621caa518 100644 --- a/engine/installation/linux/ubuntu.md +++ b/engine/installation/linux/ubuntu.md @@ -4,7 +4,8 @@ title: Choose Docker CE or Docker EE on Ubuntu --- The instructions for installing Docker on Ubuntu depend on whether you are using -Docker EE or Docker CE. +Docker Enterprise Edition (Docker EE) or Docker Community Edition (Docker CE). +[Learn more about Docker EE and Docker CE](/engine/installation/). - [Install Docker EE on Ubuntu](/engine/installation/linux/docker-ee/ubuntu.md) - [Install Docker CE on Ubuntu](/engine/installation/linux/docker-ce/ubuntu.md)