From 37913d21880ebc0b6d2a125525ae80d7de61473f Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Fri, 9 Nov 2018 10:09:47 -0800 Subject: [PATCH 01/15] Updated version to 18.09 and moved a note for 18.03 engine only and 17.06 as previous versions.. --- _includes/ee-linux-install-reuse.md | 36 ++++++++++++++++------------- install/linux/docker-ee/suse.md | 17 ++++++++------ install/linux/docker-ee/ubuntu.md | 21 ++++++++++------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index 4b075b899f..53fb65745a 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -137,20 +137,17 @@ You only need to set up the repository once, after which you can install Docker {% elsif section == "install-using-yum-repo" %} -There are currently two versions of Docker EE Engine available: +The current version of Docker EE Engine is 18.09. -* 18.03 - Use this version if you're only running Docker EE Engine. -* 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 (Docker -Engine, UCP, and DTR). +> ***NOTE:*** There are two previous versions of Docker EE Engine available: +> * 18.03 - Use this version if you're only running Docker EE Engine. +> * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 +> (Docker Engine, UCP, and DTR). +> +> By default, Docker EE Engine 18.09 is installed. -1. By default, Docker EE Engine 17.06 is installed. If you want to install the -18.03 version run: - ```bash - sudo yum-config-manager --enable docker-ee-stable-18.03 - ``` - -2. Install the latest patch release, or go to the next step to install a specific version: +1. Install the latest patch release, or go to the next step to install a specific version: ```bash $ sudo yum -y install docker-ee @@ -158,27 +155,34 @@ Engine, UCP, and DTR). If prompted to accept the GPG key, verify that the fingerprint matches `{{ gpg-fingerprint }}`, and if so, accept it. -3. To install a _specific version_ of Docker EE (recommended in production), list versions and install: + +2. To install a _specific version_ of Docker EE (recommended in production), list versions and install: a. List and sort the versions available in your repo. This example sorts results by version number, highest to lowest, and is truncated: ```bash $ sudo yum list docker-ee --showduplicates | sort -r - docker-ee.x86_64 {{ site.docker_ee_version }}.ee.2-1.el7.{{ linux-dist }} docker-ee-stable-17.06 + docker-ee.x86_64 {{ site.docker_ee_version }}.ee.2-1.el7.{{ linux-dist }} docker-ee-stable-18.09 ``` The list returned depends on which repositories you enabled, and is specific to your version of {{ linux-dist-long }} (indicated by `.el7` in this example). - b. Install a specific version by its **fully qualified package name** which is the package name (`docker-ee`) plus the version string (2nd column) up to the hyphen, for example: `docker-ee-17.06.1.ee.2` + b. Install a specific version by its **fully qualified package name** which is the package name (`docker-ee`) plus the version string (2nd column) up to the hyphen, for example: `docker-ee-18.09.ee.2` ```bash $ sudo yum -y install ``` + For example, if you want to install the 18.09 version run the following: + + ```bash + sudo yum-config-manager --enable docker-ee-stable-18.09 + ``` + Docker is installed but not started. The `docker` group is created, but no users are added to the group. -4. Start Docker: +3. Start Docker: > If using `devicemapper`, ensure it is properly configured before starting Docker, per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }. @@ -186,7 +190,7 @@ Engine, UCP, and DTR). $ sudo systemctl start docker ``` -5. Verify that Docker EE is installed correctly by running the `hello-world` +4. Verify that Docker EE is installed correctly by running the `hello-world` image. This command downloads a test image, runs it in a container, prints an informational message, and exits: diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md index eb1905a37e..48cb30601d 100644 --- a/install/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -164,11 +164,14 @@ Before you install Docker EE for the first time on a new host machine, you need to set up the Docker repository. Afterward, you can install and update Docker EE from the repository. -There are currently two versions of Docker EE Engine available: +The current version of Docker EE Engine is 18.09. -* 18.03 - Use this version if you're only running Docker EE Engine. -* 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 (Docker -Engine, UCP, and DTR). +> ***NOTE:*** There are two previous versions of Docker EE Engine available: +> * 18.03 - Use this version if you're only running Docker EE Engine. +> * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 +> (Docker Engine, UCP, and DTR). +> +> By default, Docker EE Engine 18.09 is installed. #### Set up the repository @@ -183,12 +186,12 @@ Engine, UCP, and DTR). Where: * `DOCKER-EE-URL` is the URL from your Docker Store subscription. * `ARCHITECTURE` is `x86_64`, `s390x`, or `ppc64le`. - * `VERSION` is `18.03` or `17.06`. + * `VERSION` is `18.09` As an example your command should look like: ```bash - DOCKER_EE_URL="https://storebits.docker.com/ee/sles/sub-555-55-555/sles/12.3/x86_64/stable-17.06" + DOCKER_EE_URL="https://storebits.docker.com/ee/sles/sub-555-55-555/sles/12.3/x86_64/stable-18.09" ``` 2. Use the following command to set up the **stable** repository. Use the @@ -307,7 +310,7 @@ other optional configuration steps. To upgrade Docker EE: 1. If upgrading to a new major Docker EE version (such as when going from - Docker 17.03.x to Docker 17.06.x), + Docker 18.03.x to Docker 18.09.x), [add the new repository](#set-up-the-repository){: target="_blank" class="_" }. 2. Run `sudo zypper refresh`. diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md index ddaf699eeb..572b243cbe 100644 --- a/install/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -136,11 +136,16 @@ from the repository. ``` 4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment. - There are currently two versions of Docker EE Engine available: - * `stable-18.03` - Use this version if you're only running Docker EE Engine. - * `stable-17.06` - Use this version if you're using Docker Enterprise Edition (Docker - Engine, UCP, and DTR). + + The current version of Docker EE Engine is 18.09. + + > ***NOTE:*** There are two previous versions of Docker EE Engine available: + > * 18.03 - Use this version if you're only running Docker EE Engine. + > * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 + > (Docker Engine, UCP, and DTR). + > + > By default, Docker EE Engine 18.09 is installed. ```bash $ DOCKER_EE_VERSION= @@ -185,7 +190,7 @@ from the repository. $ sudo add-apt-repository \ "deb [arch=amd64] $DOCKER_EE_URL/ubuntu \ $(lsb_release -cs) \ - stable-17.06" + stable-18.09" ``` @@ -195,7 +200,7 @@ from the repository. $ sudo add-apt-repository \ "deb [arch=s390x] $DOCKER_EE_URL/ubuntu \ $(lsb_release -cs) \ - stable-17.06" + stable-18.09" ``` @@ -205,7 +210,7 @@ from the repository. $ sudo add-apt-repository \ "deb [arch=ppc64el] $DOCKER_EE_URL/ubuntu \ $(lsb_release -cs) \ - stable-17.06" + stable-18.09" ``` @@ -279,7 +284,7 @@ steps. To upgrade Docker EE: 1. If upgrading to a new major Docker EE version (such as when going from - Docker 17.03.x to Docker 17.06.x), + Docker 18.03.x to Docker 18.09.x), [add the new repository](#set-up-the-repository){: target="_blank" class="_" }. 2. Run `sudo apt-get update`. From 43a492e0fc3d2d4c37895b08569d421282b5ea4a Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:39:14 -0800 Subject: [PATCH 02/15] Update ee-linux-install-reuse.md --- _includes/ee-linux-install-reuse.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index 53fb65745a..92f537d7a1 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -137,9 +137,9 @@ You only need to set up the repository once, after which you can install Docker {% elsif section == "install-using-yum-repo" %} -The current version of Docker EE Engine is 18.09. +The current version of Docker EE Engine is 18.09 for Docker Enterprise Edition 2.1. -> ***NOTE:*** There are two previous versions of Docker EE Engine available: +> ***NOTE:*** There are two older versions of Docker EE Engine available: > * 18.03 - Use this version if you're only running Docker EE Engine. > * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 > (Docker Engine, UCP, and DTR). From 70a7d5ef0f8d350174a4c14427706b03d50b4908 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:39:56 -0800 Subject: [PATCH 03/15] Update suse.md --- install/linux/docker-ee/suse.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md index 48cb30601d..42eb1648b9 100644 --- a/install/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -164,9 +164,9 @@ Before you install Docker EE for the first time on a new host machine, you need to set up the Docker repository. Afterward, you can install and update Docker EE from the repository. -The current version of Docker EE Engine is 18.09. +The current version of Docker EE Engine is 18.09 for Docker Enterprise Edition 2.1. -> ***NOTE:*** There are two previous versions of Docker EE Engine available: +> ***NOTE:*** There are two older versions of Docker EE Engine available: > * 18.03 - Use this version if you're only running Docker EE Engine. > * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 > (Docker Engine, UCP, and DTR). From d9e24d6de4853767d9293ba63e6c75ac1592bcef Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:40:46 -0800 Subject: [PATCH 04/15] Update ubuntu.md --- install/linux/docker-ee/ubuntu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md index 572b243cbe..c7eeeed8d5 100644 --- a/install/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -138,9 +138,9 @@ from the repository. 4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment. - The current version of Docker EE Engine is 18.09. + The current version of Docker EE Engine is 18.09 for Docker Enterprise Edition 2.1. - > ***NOTE:*** There are two previous versions of Docker EE Engine available: + > ***NOTE:*** There are two older versions of Docker EE Engine available: > * 18.03 - Use this version if you're only running Docker EE Engine. > * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 > (Docker Engine, UCP, and DTR). From a0274be65fbee35df4fd7fda3cf61d0083ded601 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:44:32 -0800 Subject: [PATCH 05/15] Update ee-linux-install-reuse.md --- _includes/ee-linux-install-reuse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index 92f537d7a1..ff033aebeb 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -137,7 +137,7 @@ You only need to set up the repository once, after which you can install Docker {% elsif section == "install-using-yum-repo" %} -The current version of Docker EE Engine is 18.09 for Docker Enterprise Edition 2.1. +The current version of Docker EE Engine is 18.09 for using with Docker Enterprise Edition 2.1. > ***NOTE:*** There are two older versions of Docker EE Engine available: > * 18.03 - Use this version if you're only running Docker EE Engine. From a8626b7d88106cfc7e77288a1e84b4a292f0c18b Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:45:18 -0800 Subject: [PATCH 06/15] Update suse.md --- install/linux/docker-ee/suse.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md index 42eb1648b9..25296d50ce 100644 --- a/install/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -164,7 +164,7 @@ Before you install Docker EE for the first time on a new host machine, you need to set up the Docker repository. Afterward, you can install and update Docker EE from the repository. -The current version of Docker EE Engine is 18.09 for Docker Enterprise Edition 2.1. +The current version of Docker EE Engine is 18.09 for using with Docker Enterprise Edition 2.1. > ***NOTE:*** There are two older versions of Docker EE Engine available: > * 18.03 - Use this version if you're only running Docker EE Engine. From d151677f809fc29f4b2c2d1cf452f45f977b9122 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:46:01 -0800 Subject: [PATCH 07/15] Update ubuntu.md --- install/linux/docker-ee/ubuntu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md index c7eeeed8d5..a1b024d8d6 100644 --- a/install/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -138,7 +138,7 @@ from the repository. 4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment. - The current version of Docker EE Engine is 18.09 for Docker Enterprise Edition 2.1. + The current version of Docker EE Engine is 18.09 for using with Docker Enterprise Edition 2.1. > ***NOTE:*** There are two older versions of Docker EE Engine available: > * 18.03 - Use this version if you're only running Docker EE Engine. From 32243eeb55edc015be74df4a00976c21c4403cc7 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 07:52:40 -0800 Subject: [PATCH 08/15] Update suse.md Fixed wording in the note, as well as put in links for the previous version installation guides. --- install/linux/docker-ee/suse.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md index 25296d50ce..1b4dad76c4 100644 --- a/install/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -164,14 +164,12 @@ Before you install Docker EE for the first time on a new host machine, you need to set up the Docker repository. Afterward, you can install and update Docker EE from the repository. -The current version of Docker EE Engine is 18.09 for using with Docker Enterprise Edition 2.1. +For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. -> ***NOTE:*** There are two older versions of Docker EE Engine available: -> * 18.03 - Use this version if you're only running Docker EE Engine. -> * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 -> (Docker Engine, UCP, and DTR). -> -> By default, Docker EE Engine 18.09 is installed. +> ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: +> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running Docker EE Engine. +> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise +> Edition 2.0 (Docker Engine, UCP, and DTR). #### Set up the repository From 6b75ae34eda212c04feaaa8c4c28ff8894885746 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 08:54:12 -0700 Subject: [PATCH 09/15] Update ee-linux-install-reuse.md Fixed wording in the note and added links. --- _includes/ee-linux-install-reuse.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index ff033aebeb..c0a6c5f8d4 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -137,14 +137,12 @@ You only need to set up the repository once, after which you can install Docker {% elsif section == "install-using-yum-repo" %} -The current version of Docker EE Engine is 18.09 for using with Docker Enterprise Edition 2.1. +For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. -> ***NOTE:*** There are two older versions of Docker EE Engine available: -> * 18.03 - Use this version if you're only running Docker EE Engine. -> * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 -> (Docker Engine, UCP, and DTR). -> -> By default, Docker EE Engine 18.09 is installed. +> ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: +> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running Docker EE Engine. +> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise +> Edition 2.0 (Docker Engine, UCP, and DTR). 1. Install the latest patch release, or go to the next step to install a specific version: From c853b0a54bab1debd46ef18eb769e51c834831a1 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 08:55:17 -0700 Subject: [PATCH 10/15] Update ubuntu.md Fixed wording and added links to the note. --- install/linux/docker-ee/ubuntu.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md index a1b024d8d6..e08705b9c9 100644 --- a/install/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -138,14 +138,13 @@ from the repository. 4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment. - The current version of Docker EE Engine is 18.09 for using with Docker Enterprise Edition 2.1. + For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. - > ***NOTE:*** There are two older versions of Docker EE Engine available: - > * 18.03 - Use this version if you're only running Docker EE Engine. - > * 17.06 - Use this version if you're using Docker Enterprise Edition 2.0 - > (Docker Engine, UCP, and DTR). - > - > By default, Docker EE Engine 18.09 is installed. + > ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: + > * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running + > Docker EE Engine. + > * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise + > Edition 2.0 (Docker Engine, UCP, and DTR). ```bash $ DOCKER_EE_VERSION= From 0ff126b7d4c49386689057b6db40b28b553a2f86 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 13:52:30 -0800 Subject: [PATCH 11/15] Update ee-linux-install-reuse.md Changed 18.09.ee.x to 18.09.0 --- _includes/ee-linux-install-reuse.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index c0a6c5f8d4..5e66797c8a 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -166,7 +166,7 @@ For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation inst The list returned depends on which repositories you enabled, and is specific to your version of {{ linux-dist-long }} (indicated by `.el7` in this example). - b. Install a specific version by its **fully qualified package name** which is the package name (`docker-ee`) plus the version string (2nd column) up to the hyphen, for example: `docker-ee-18.09.ee.2` + b. Install a specific version by its **fully qualified package name** which is the package name (`docker-ee`) plus the version string (2nd column) up to the hyphen, for example: `docker-ee-18.09.0` ```bash $ sudo yum -y install @@ -175,7 +175,7 @@ For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation inst For example, if you want to install the 18.09 version run the following: ```bash - sudo yum-config-manager --enable docker-ee-stable-18.09 + sudo yum-config-manager --enable docker-ee-stable-18.09.0 ``` Docker is installed but not started. The `docker` group is created, but no users are added to the group. From fb2cb1ce34dc2d617635c3a979ad9ee1a6fb6eda Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 13:53:20 -0800 Subject: [PATCH 12/15] Update ee-linux-install-reuse.md Removed "For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. " --- _includes/ee-linux-install-reuse.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index 5e66797c8a..6ed9853368 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -137,8 +137,6 @@ You only need to set up the repository once, after which you can install Docker {% elsif section == "install-using-yum-repo" %} -For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. - > ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: > * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running Docker EE Engine. > * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise From a6c4367af9745174c942778add41306309741da8 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 13:58:06 -0800 Subject: [PATCH 13/15] Update suse.md --- install/linux/docker-ee/suse.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md index 1b4dad76c4..87c1140e3b 100644 --- a/install/linux/docker-ee/suse.md +++ b/install/linux/docker-ee/suse.md @@ -164,12 +164,10 @@ Before you install Docker EE for the first time on a new host machine, you need to set up the Docker repository. Afterward, you can install and update Docker EE from the repository. -For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. - > ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: -> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running Docker EE Engine. -> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise -> Edition 2.0 (Docker Engine, UCP, and DTR). +> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release +> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine, +> UCP, and DTR). #### Set up the repository From 632a8b9c824873ca74c3e51157b1988cba4240bd Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 13:59:48 -0800 Subject: [PATCH 14/15] Update ubuntu.md --- install/linux/docker-ee/ubuntu.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md index e08705b9c9..2277d11b40 100644 --- a/install/linux/docker-ee/ubuntu.md +++ b/install/linux/docker-ee/ubuntu.md @@ -137,14 +137,10 @@ from the repository. 4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment. - - For Docker Enterprise Edition 2.1, use Docker EE Engine 18.09. Installation instructions start below the note. - - > ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: - > * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running - > Docker EE Engine. - > * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise - > Edition 2.0 (Docker Engine, UCP, and DTR). + > ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: + > * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release + > * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine, + > UCP, and DTR). ```bash $ DOCKER_EE_VERSION= From f65cd52dcfa2c060165828d6a8a1ffc22af0ef42 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Mon, 12 Nov 2018 14:00:27 -0800 Subject: [PATCH 15/15] Update ee-linux-install-reuse.md Fixed note. --- _includes/ee-linux-install-reuse.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md index 6ed9853368..9f76211f25 100644 --- a/_includes/ee-linux-install-reuse.md +++ b/_includes/ee-linux-install-reuse.md @@ -138,10 +138,9 @@ You only need to set up the repository once, after which you can install Docker {% elsif section == "install-using-yum-repo" %} > ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: -> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Use this version if you're only running Docker EE Engine. -> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Use this version if you're using Docker Enterprise -> Edition 2.0 (Docker Engine, UCP, and DTR). - +> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release +> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine, +> UCP, and DTR). 1. Install the latest patch release, or go to the next step to install a specific version: