From 37913d21880ebc0b6d2a125525ae80d7de61473f Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Fri, 9 Nov 2018 10:09:47 -0800 Subject: [PATCH] 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`.