diff --git a/_config.yml b/_config.yml index 0c3c6bd6ac..1344ee1918 100644 --- a/_config.yml +++ b/_config.yml @@ -58,7 +58,7 @@ dtr_versions: path: /datacenter/dtr/2.0/ tablabels: - deep-2.0: Docker Enterprise Edition Platform 2.0 + dee-2.0: Docker Enterprise Edition 2.0 ucp-3.0: Universal Control Plane 3.0 ucp-2.2: Universal Control Plane 2.2 dtr-2.5: Docker Trusted Registry 2.5 diff --git a/_config_authoring.yml b/_config_authoring.yml index 4bead373ae..32cc12f41e 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -58,7 +58,7 @@ dtr_versions: path: /datacenter/dtr/2.0/ tablabels: - deep-2.0: Docker Enterprise Edition Platform 2.0 + dee-2.0: Docker Enterprise Edition 2.0 ucp-3.0: Universal Control Plane 3.0 ucp-2.2: Universal Control Plane 2.2 dtr-2.5: Docker Trusted Registry 2.5 diff --git a/datacenter/install/linux.md b/datacenter/install/linux.md index c636ef686c..1fbee37bbc 100644 --- a/datacenter/install/linux.md +++ b/datacenter/install/linux.md @@ -3,8 +3,8 @@ title: Deploy Enterprise Edition on Linux servers description: Learn how to get a trial license and install Docker Enterprise Edition. keywords: ucp, dtr, install, orchestration ui_tabs: -- version: deep-2.0 - orhigher: true +- version: dee-2.0 + orhigher: false next_steps: - path: ../ucp/3.0/guides/admin/configure/scale-your-cluster/ title: Scale your UCP cluster @@ -13,7 +13,7 @@ next_steps: redirect_from: - /datacenter/try/ --- -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} The best way to try Docker Enterprise Edition for yourself is to get the [30-day trial available at the Docker Store](https://store.docker.com/search?offering=enterprise&type=edition). diff --git a/datacenter/ucp/3.0/guides/get-support.md b/datacenter/ucp/3.0/guides/get-support.md index 43796939c4..a20a6241db 100644 --- a/datacenter/ucp/3.0/guides/get-support.md +++ b/datacenter/ucp/3.0/guides/get-support.md @@ -2,7 +2,16 @@ title: Get support description: Your Docker EE subscription gives you access to prioritized support. You can file tickets via email or the support portal. keywords: support, help +ui_tabs: +- version: ucp-3.0 + orlower: true +cli_tabs: +- version: docker-cli-linux +- version: docker-cli-win --- +{% if include.ui %} + +{% if include.version=="ucp-3.0" %} Your Docker Enterprise Edition subscription gives you access to prioritized support. The service levels depend on your subscription. @@ -18,20 +27,23 @@ Docker Support engineers may ask you to provide a UCP support dump, which is an archive that contains UCP system logs and diagnostic information. To obtain a support dump: -## From the UI - 1. Log into the UCP web UI with an administrator account. 2. In the top-left menu, click your username and choose **Download Logs**. ![](images/get-support-1.png){: .with-border} -## From the CLI +{% endif %} +{% endif %} + +{% if include.cli %} + +{% if include.version=="docker-cli-linux" %} To get the support dump from the CLI, use SSH to log into a UCP manager node and run: -```none +```bash docker container run --rm \ --name ucp \ -v /var/run/docker.sock:/var/run/docker.sock \ @@ -44,11 +56,16 @@ This support dump only contains logs for the node where you're running the command. If your UCP is highly available, you should collect support dumps from all of the manager nodes. +{% elsif include.version=="docker-cli-win" %} + On Windows worker nodes, run the following command to generate a local support dump: -```ps -PS> docker container run --name windowssupport -v 'C:\ProgramData\docker\daemoncerts:C:\ProgramData\docker\daemoncerts' -v 'C:\Windows\system32\winevt\logs:C:\eventlogs:ro' {{ page.ucp_org }}/ucp-dsinfo-win:{{ page.ucp_version }}; docker cp windowssupport:'C:\dsinfo' .; docker rm -f windowssupport +```powershell +docker container run --name windowssupport -v 'C:\ProgramData\docker\daemoncerts:C:\ProgramData\docker\daemoncerts' -v 'C:\Windows\system32\winevt\logs:C:\eventlogs:ro' {{ page.ucp_org }}/ucp-dsinfo-win:{{ page.ucp_version }}; docker cp windowssupport:'C:\dsinfo' .; docker rm -f windowssupport ``` This command creates a directory named `dsinfo` in your current directory. If you want an archive file, you need to create it from the `dsinfo` directory. + +{% endif %} +{% endif %} \ No newline at end of file diff --git a/datacenter/ucp/3.0/guides/release-notes.md b/datacenter/ucp/3.0/guides/release-notes.md index 7e4bc0ed6e..cfce68d235 100644 --- a/datacenter/ucp/3.0/guides/release-notes.md +++ b/datacenter/ucp/3.0/guides/release-notes.md @@ -3,7 +3,13 @@ title: UCP 3.0 Beta1 release notes description: Release notes for Docker Universal Control Plane. Learn more about the changes introduced in the latest versions. keywords: UCP, release notes +ui_tabs: +- version: ucp-3.0 + orhigher: false +- version: ucp-2.2 + orlower: true --- +{% if include.version=="ucp-3.0" %} Here you can learn about new features, bug fixes, breaking changes, and known issues for the latest UCP version. @@ -40,7 +46,7 @@ advantage of the added features. an iptables incompatibility. * UCP 3.0 requires more resources to run than UCP 2.2 and is unlikely to work correctly on nodes with less than 4GB of total memory. -* The kubernetes SPDY operations such as `kubectl logs` or `kubectl exec` are +* The Kubernetes SPDY operations such as `kubectl logs` or `kubectl exec` are not possible when using the client bundle feature. As a workaround, you may change all references from `:443` to `:6443` in the `kube.yml` and `env.sh` files of a user client bundle. @@ -86,3 +92,12 @@ Calico (which is included). visible in the UI because of a problem with the middleware object store. * If all the nodes in UCP are using IBM Z, Kubernetes functionality will show up on the web UI but not be available for use. + +{% elsif include.version=="ucp-2.2" %} + +- [UCP 2.2 release notes](/datacenter/ucp/2.2/guides/release-notes.md) +- [UCP 2.1 release notes](/datacenter/ucp/2.1/guides/release-notes/index.md) +- [UCP 2.0 release notes](/datacenter/ucp/2.0/guides/release-notes.md) +- [UCP 1.1 release notes](/datacenter/ucp/1.1/release_notes.md) + +{% endif %} diff --git a/datacenter/ucp/3.0/guides/ucp-architecture.md b/datacenter/ucp/3.0/guides/ucp-architecture.md index 6610ff5c3b..62af24abbf 100644 --- a/datacenter/ucp/3.0/guides/ucp-architecture.md +++ b/datacenter/ucp/3.0/guides/ucp-architecture.md @@ -3,7 +3,7 @@ title: UCP architecture description: Learn about the architecture of Docker Universal Control Plane. keywords: ucp, architecture ui_tabs: -- version: deep-2.0 +- version: ucp-3.0 orhigher: false next_steps: - path: admin/install/system-requirements @@ -11,7 +11,7 @@ next_steps: - path: admin/install/plan-installation title: Plan your installation --- -{% if include.version=="deep-2.0" %} +{% if include.version=="ucp-3.0" %} Universal Control Plane is a containerized application that runs on [Docker Enterprise Edition](/enterprise/index.md) and extends its functionality diff --git a/enterprise/backup.md b/enterprise/backup.md index 41a769abf3..0ef746d8dd 100644 --- a/enterprise/backup.md +++ b/enterprise/backup.md @@ -3,14 +3,14 @@ title: Backup Docker EE description: | Learn how to create a backup of your Docker Enterprise Edition, and how to restore from a backup. ui_tabs: -- version: deep-2.0 +- version: dee-2.0 orhigher: false next_steps: - path: upgrade/ title: Upgrade Docker EE keywords: enterprise, backup, restore --- -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} To backup Docker Enterprise Edition you need to create individual backups for each of the following components: diff --git a/enterprise/docker-ee-architecture.md b/enterprise/docker-ee-architecture.md index 85914e9643..c0dfe0a3ee 100644 --- a/enterprise/docker-ee-architecture.md +++ b/enterprise/docker-ee-architecture.md @@ -3,7 +3,7 @@ title: Docker EE architecture description: Learn about the architecture of Docker Enterprise Edition and how it delivers high availability for your workloads. keywords: Docker EE, UCP, DTR, architecture, orchestration, Kubernetes, Swarm, cluster, high availability ui_tabs: -- version: deep-2.0 +- version: dee-2.0 orhigher: false next_steps: - path: /datacenter/ucp/3.0/guides/ucp-architecture/ @@ -12,7 +12,7 @@ next_steps: title: DTR architecture --- -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} Docker Enterprise Edition (EE) enables deploying your workloads for high availability (HA) onto the orchestrator of your choice. Docker EE system diff --git a/enterprise/index.md b/enterprise/index.md index 51669018dc..52d70ac3da 100644 --- a/enterprise/index.md +++ b/enterprise/index.md @@ -3,7 +3,7 @@ title: Docker Enterprise Edition Platform description: | Learn about Docker Enterprise Edition, the enterprise-grade cluster management solution from Docker. ui_tabs: -- version: deep-2.0 +- version: dee-2.0 orhigher: false cli_tabs: - version: docker-cli-linux @@ -16,7 +16,7 @@ next_steps: keywords: Docker EE, UCP, DTR, orchestration, cluster, Kubernetes --- -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} Docker Enterprise Edition Platform 2.0 (*Docker EE*) is a Containers-as-a-Service (CaaS) platform that enables a secure software supply diff --git a/enterprise/supported-platforms.md b/enterprise/supported-platforms.md index 2836656d37..95203fafd3 100644 --- a/enterprise/supported-platforms.md +++ b/enterprise/supported-platforms.md @@ -3,7 +3,7 @@ title: About Docker EE description: | Information about Docker Enterprise Edition Platform 2.0 ui_tabs: -- version: deep-2.0 +- version: dee-2.0 orhigher: false next_steps: - path: /engine/installation/ @@ -12,7 +12,7 @@ next_steps: title: Get Started with Docker keywords: enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine --- -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} Docker Enterprise Edition (*Docker EE*) is designed for enterprise development and IT teams who build, ship, and run business-critical diff --git a/enterprise/telemetry.md b/enterprise/telemetry.md index f2fb9bbf8a..be7c34bbac 100644 --- a/enterprise/telemetry.md +++ b/enterprise/telemetry.md @@ -4,15 +4,15 @@ title: Manage usage data collection description: | Understand and manage usage data collected by Docker EE and sent to Docker. ui_tabs: -- version: deep-2.0 - orhigher: true +- version: dee-2.0 + orhigher: false cli_tabs: - version: docker-cli-linux keywords: enterprise, telemetry, data collection --- {% if include.ui %} -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} Docker EE Engine version 17.06 and later includes a telemetry plugin. The plugin is enabled by default on Ubuntu starting with Docker EE 17.06.0 diff --git a/enterprise/upgrade.md b/enterprise/upgrade.md index 3b6ad9514a..b37a58ba2f 100644 --- a/enterprise/upgrade.md +++ b/enterprise/upgrade.md @@ -3,14 +3,14 @@ title: Upgrade Docker EE description: | Learn how to upgrade your Docker Enterprise Edition, to start using the latest features and security patches. ui_tabs: -- version: deep-2.0 +- version: dee-2.0 orhigher: false next_steps: - path: backup/ title: Backup Docker EE keywords: enterprise, upgrade --- -{% if include.version=="deep-2.0" %} +{% if include.version=="dee-2.0" %} To upgrade Docker Enterprise Edition you need to individually upgrade each of the following components: