From b75b7d76c4a38bfa4cf9f291a6f0d198c8db5c67 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Mon, 5 Nov 2018 11:57:53 -0800 Subject: [PATCH 1/2] Update RAM requirements for DTR installation and upgrade pages --- ee/dtr/admin/install/system-requirements.md | 8 ++++---- ee/dtr/admin/upgrade.md | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ee/dtr/admin/install/system-requirements.md b/ee/dtr/admin/install/system-requirements.md index 3c5b9e9fdf..1a44e44b8e 100644 --- a/ee/dtr/admin/install/system-requirements.md +++ b/ee/dtr/admin/install/system-requirements.md @@ -16,7 +16,7 @@ all nodes must: ### Minimum requirements -* 8GB of RAM for nodes running DTR +* 16GB of RAM for nodes running DTR * 2 vCPUs for nodes running DTR * 10GB of free disk space @@ -46,9 +46,9 @@ These ports are configurable when installing DTR. Docker Enterprise Edition is a software subscription that includes three products: -* Docker Engine EE, -* Docker Trusted Registry, -* Docker Universal Control Plane. +* Docker Enterprise Engine +* Docker Trusted Registry +* Docker Universal Control Plane [Learn more about the maintenance lifecycle for these products](https://success.docker.com/article/Compatibility_Matrix). diff --git a/ee/dtr/admin/upgrade.md b/ee/dtr/admin/upgrade.md index 4a82f49c98..f8d88971b9 100644 --- a/ee/dtr/admin/upgrade.md +++ b/ee/dtr/admin/upgrade.md @@ -41,13 +41,14 @@ to avoid any business impacts. Before starting your upgrade, make sure that: * The version of UCP you are using is supported by the version of DTR you are trying to upgrade to. [Check the compatibility matrix](https://success.docker.com/article/compatibility-matrix). -* You have a recent [DTR backup](disaster-recovery/create-a-backup.md). +* You have a recent [DTR backup](disaster-recovery/create-a-backup). * You [disable Docker content trust in UCP](/ee/ucp/admin/configure/run-only-the-images-you-trust/). +* You [meet the system requirements](install/system-requirements.md). ### Step 1. Upgrade DTR to {{ previous_version }} if necessary -Make sure you're running DTR {{ previous_version }}. If that's not the case, -[upgrade your installation to the {{ previous_version }} version](/datacenter/dtr/{{ previous_version }}/guides/admin/upgrade.md). +Make sure you are running DTR {{ previous_version }}. If that is not the case, +[upgrade your installation to the {{ previous_version }} version](../{{ previous_version }}/guides/admin/upgrade/). ### Step 2. Upgrade DTR @@ -57,7 +58,7 @@ Then pull the latest version of DTR: docker pull {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} ``` -If the node you're upgrading doesn't have access to the internet, you can +Make sure you have at least [16GB of available RAM](install/system-requirements.md) on the node you are runningthe upgrade on. If the DTR node does not have access to the internet, you can follow the [offline installation documentation](install/install-offline.md) to get the images. @@ -76,12 +77,12 @@ any necessary information. You can also check the The upgrade command will start replacing every container in your DTR cluster, one replica at a time. It will also perform certain data migrations. If anything -fails or the upgrade is interrupted for any reason, you can re-run the upgrade +fails or the upgrade is interrupted for any reason, you can rerun the upgrade command and it will resume from where it left off. ## Patch upgrade -A patch upgrade changes only the DTR containers and it's always safer than a minor +A patch upgrade changes only the DTR containers and is always safer than a minor version upgrade. The command is the same as for a minor upgrade. ## 2.5 to 2.6 upgrade @@ -105,7 +106,7 @@ Alternatively, select **API** from the bottom left navigation pane of the DTR we ## Download the vulnerability database -After upgrading DTR, you need to re-download the vulnerability database. +After upgrading DTR, you need to redownload the vulnerability database. [Learn how to update your vulnerability database](configure/set-up-vulnerability-scans.md#update-the-cve-scanning-database). ## Where to go next From d76e18c49b5c73058033ec0d679d51baee452164 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Mon, 5 Nov 2018 12:04:57 -0800 Subject: [PATCH 2/2] Minor edits --- ee/dtr/admin/upgrade.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ee/dtr/admin/upgrade.md b/ee/dtr/admin/upgrade.md index f8d88971b9..783de15fc2 100644 --- a/ee/dtr/admin/upgrade.md +++ b/ee/dtr/admin/upgrade.md @@ -43,7 +43,7 @@ Before starting your upgrade, make sure that: are trying to upgrade to. [Check the compatibility matrix](https://success.docker.com/article/compatibility-matrix). * You have a recent [DTR backup](disaster-recovery/create-a-backup). * You [disable Docker content trust in UCP](/ee/ucp/admin/configure/run-only-the-images-you-trust/). -* You [meet the system requirements](install/system-requirements.md). +* You [meet the system requirements](install/system-requirements). ### Step 1. Upgrade DTR to {{ previous_version }} if necessary @@ -58,8 +58,8 @@ Then pull the latest version of DTR: docker pull {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} ``` -Make sure you have at least [16GB of available RAM](install/system-requirements.md) on the node you are runningthe upgrade on. If the DTR node does not have access to the internet, you can -follow the [offline installation documentation](install/install-offline.md) +Make sure you have at least [16GB of available RAM](install/system-requirements) on the node you are running the upgrade on. If the DTR node does not have access to the internet, you can +follow the [offline installation documentation](install/install-offline) to get the images. Once you have the latest image on your machine (and the images on the target @@ -111,5 +111,5 @@ After upgrading DTR, you need to redownload the vulnerability database. ## Where to go next -- [Release notes](../release-notes.md) -- [Garbage collection in v2.5](../../../v18.03/ee/dtr/admin/configure/garbage-collection.md) +- [Release notes](../release-notes) +- [Garbage collection in v2.5](../../../v18.03/ee/dtr/admin/configure/garbage-collection)