From 67f49c63d2ffe8527000f5a88201e770d2c0e96a Mon Sep 17 00:00:00 2001 From: KoryKessel-Docker Date: Wed, 18 Dec 2019 15:53:23 +0100 Subject: [PATCH 1/4] Appending of Enterprise Label to all Docker Enterprise md topic files. --- _includes/enterprise_label_shortform.md | 4 ++++ cluster/aws.md | 2 ++ cluster/azure.md | 2 ++ cluster/cluster-file.md | 2 ++ cluster/index.md | 2 ++ cluster/reference/envvars.md | 2 ++ cluster/release-notes.md | 2 ++ ee/admin/backup/back-up-ucp.md | 2 ++ ee/admin/restore/restore-ucp.md | 2 ++ ee/docker-ee/centos.md | 2 ++ ee/docker-ee/oracle.md | 2 ++ ee/docker-ee/rhel.md | 2 ++ ee/docker-ee/suse.md | 2 ++ ee/docker-ee/ubuntu.md | 2 ++ ee/docker-ee/windows/docker-ee.md | 2 ++ ee/dtr/admin/configure/allow-creation-on-push.md | 2 ++ ee/dtr/admin/configure/auto-delete-repo-events.md | 2 ++ .../admin/configure/deploy-caches/configuration-reference.md | 2 ++ ee/dtr/admin/configure/deploy-caches/high-availability.md | 2 ++ ee/dtr/admin/configure/deploy-caches/index.md | 2 ++ ee/dtr/admin/configure/deploy-caches/simple-kube.md | 2 ++ ee/dtr/admin/configure/deploy-caches/simple.md | 2 ++ ee/dtr/admin/configure/deploy-caches/strategy.md | 2 ++ ee/dtr/admin/configure/disable-persistent-cookies.md | 3 +++ ee/dtr/admin/configure/enable-single-sign-on.md | 2 ++ ee/dtr/admin/configure/external-storage/index.md | 2 ++ ee/dtr/admin/configure/external-storage/nfs.md | 2 ++ ee/dtr/admin/configure/external-storage/s3.md | 2 ++ .../configure/external-storage/storage-backend-migration.md | 2 ++ ee/dtr/admin/configure/garbage-collection.md | 2 ++ ee/dtr/admin/configure/license-your-installation.md | 2 ++ ee/dtr/admin/configure/set-up-high-availability.md | 2 ++ ee/dtr/admin/configure/set-up-vulnerability-scans.md | 2 ++ ee/dtr/admin/configure/use-a-load-balancer.md | 2 ++ ee/dtr/admin/configure/use-a-web-proxy.md | 2 ++ ee/dtr/admin/configure/use-your-own-tls-certificates.md | 2 ++ ee/dtr/admin/disaster-recovery/create-a-backup.md | 2 ++ ee/dtr/admin/disaster-recovery/index.md | 2 ++ ee/dtr/admin/disaster-recovery/repair-a-cluster.md | 2 ++ ee/dtr/admin/disaster-recovery/repair-a-single-replica.md | 2 ++ ee/dtr/admin/disaster-recovery/restore-from-backup.md | 2 ++ ee/dtr/admin/install/index.md | 2 ++ ee/dtr/admin/install/install-offline.md | 2 ++ ee/dtr/admin/install/system-requirements.md | 2 ++ ee/dtr/admin/install/uninstall.md | 2 ++ ee/dtr/admin/manage-jobs/audit-jobs-via-api.md | 2 ++ ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md | 2 ++ ee/dtr/admin/manage-jobs/auto-delete-job-logs.md | 2 ++ ee/dtr/admin/manage-jobs/job-queue.md | 2 ++ ee/dtr/admin/manage-users/create-and-manage-orgs.md | 2 ++ ee/dtr/admin/manage-users/create-and-manage-teams.md | 2 ++ ee/dtr/admin/manage-users/create-and-manage-users.md | 2 ++ ee/dtr/admin/manage-users/index.md | 2 ++ ee/dtr/admin/manage-users/permission-levels.md | 2 ++ ee/dtr/admin/manage-webhooks/index.md | 2 ++ ee/dtr/admin/manage-webhooks/use-the-api.md | 2 ++ ee/dtr/admin/manage-webhooks/use-the-web-ui.md | 2 ++ ee/dtr/admin/monitor-and-troubleshoot/index.md | 2 ++ ee/dtr/admin/monitor-and-troubleshoot/notary-audit-logs.md | 2 ++ .../admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md | 2 ++ ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-dtr.md | 2 ++ ee/dtr/admin/upgrade.md | 2 ++ ee/dtr/architecture.md | 2 ++ ee/dtr/index.md | 2 ++ ee/dtr/release-notes.md | 2 ++ ee/dtr/user/access-dtr/index.md | 2 ++ ee/dtr/user/access-dtr/use-a-cache.md | 2 ++ ee/dtr/user/access-tokens.md | 2 ++ ee/dtr/user/audit-repository-events.md | 2 ++ ee/dtr/user/manage-applications.md | 2 ++ ee/dtr/user/manage-images/delete-images.md | 2 ++ ee/dtr/user/manage-images/index.md | 2 ++ ee/dtr/user/manage-images/override-a-vulnerability.md | 2 ++ .../user/manage-images/prevent-tags-from-being-overwritten.md | 2 ++ ee/dtr/user/manage-images/pull-and-push-images.md | 2 ++ ee/dtr/user/manage-images/review-repository-info.md | 2 ++ ee/dtr/user/manage-images/scan-images-for-vulnerabilities.md | 2 ++ ee/dtr/user/manage-images/sign-images/index.md | 2 ++ .../user/manage-images/sign-images/trust-with-remote-ucp.md | 2 ++ ee/dtr/user/promotion-policies/index.md | 2 ++ ee/dtr/user/promotion-policies/internal-promotion.md | 2 ++ ee/dtr/user/promotion-policies/pull-mirror.md | 2 ++ ee/dtr/user/promotion-policies/push-mirror.md | 2 ++ ee/dtr/user/promotion-policies/templates.md | 2 ++ ee/dtr/user/tag-pruning.md | 2 ++ ee/index.md | 1 + ee/licensing.md | 2 ++ ee/release-notes.md | 2 ++ ee/supported-platforms.md | 2 ++ ee/ucp/admin/configure/add-labels-to-cluster-nodes.md | 2 ++ ee/ucp/admin/configure/add-sans-to-cluster.md | 2 ++ ee/ucp/admin/configure/admission-controllers.md | 2 ++ ee/ucp/admin/configure/collect-cluster-metrics.md | 2 ++ ee/ucp/admin/configure/configure-rbac-kube.md | 2 ++ ee/ucp/admin/configure/deploy-route-reflectors.md | 2 ++ ee/ucp/admin/configure/enable-audit-logging.md | 2 ++ ee/ucp/admin/configure/enable-helm-tiller.md | 2 ++ ee/ucp/admin/configure/enable-saml-authentication.md | 2 ++ ee/ucp/admin/configure/external-auth/index.md | 2 ++ ee/ucp/admin/configure/integrate-saml.md | 2 ++ ee/ucp/admin/configure/integrate-scim.md | 2 ++ ee/ucp/admin/configure/join-nodes/index.md | 2 ++ .../admin/configure/join-nodes/join-linux-nodes-to-cluster.md | 2 ++ .../configure/join-nodes/join-windows-nodes-to-cluster.md | 2 ++ ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md | 2 ++ ee/ucp/admin/configure/license-your-installation.md | 2 ++ ee/ucp/admin/configure/manage-and-deploy-private-images.md | 2 ++ ee/ucp/admin/configure/metrics-descriptions.md | 2 ++ ee/ucp/admin/configure/restrict-services-to-worker-nodes.md | 2 ++ ee/ucp/admin/configure/run-only-the-images-you-trust.md | 2 ++ ee/ucp/admin/configure/scale-your-cluster.md | 4 +++- ee/ucp/admin/configure/set-orchestrator-type.md | 2 ++ ee/ucp/admin/configure/set-session-timeout.md | 2 ++ ee/ucp/admin/configure/ucp-configuration-file.md | 2 ++ ee/ucp/admin/configure/use-node-local-network-in-swarm.md | 2 ++ ee/ucp/admin/configure/use-your-own-tls-certificates.md | 2 ++ ee/ucp/admin/configure/view-namespace-resources.md | 2 ++ ee/ucp/admin/install/architecture-specific-images.md | 2 ++ ee/ucp/admin/install/cloudproviders/install-on-aws.md | 2 ++ .../admin/install/cloudproviders/install-on-azure-custom.md | 2 ++ ee/ucp/admin/install/cloudproviders/install-on-azure.md | 2 ++ ee/ucp/admin/install/index.md | 2 ++ ee/ucp/admin/install/install-offline.md | 2 ++ ee/ucp/admin/install/plan-installation.md | 2 ++ ee/ucp/admin/install/system-requirements.md | 2 ++ ee/ucp/admin/install/uninstall.md | 2 ++ ee/ucp/admin/install/upgrade-offline.md | 2 ++ ee/ucp/admin/install/upgrade.md | 2 ++ ee/ucp/admin/monitor-and-troubleshoot/index.md | 2 ++ .../monitor-and-troubleshoot/troubleshoot-configurations.md | 2 ++ .../monitor-and-troubleshoot/troubleshoot-node-messages.md | 2 ++ .../admin/monitor-and-troubleshoot/troubleshoot-with-logs.md | 2 ++ ee/ucp/authorization/create-teams-with-ldap.md | 2 ++ ee/ucp/authorization/create-users-and-teams-manually.md | 2 ++ ee/ucp/authorization/define-roles.md | 2 ++ ee/ucp/authorization/deploy-stateless-app.md | 2 ++ ee/ucp/authorization/ee-advanced.md | 2 ++ ee/ucp/authorization/ee-standard.md | 2 ++ ee/ucp/authorization/grant-permissions.md | 2 ++ ee/ucp/authorization/group-resources.md | 2 ++ ee/ucp/authorization/index.md | 2 ++ ee/ucp/authorization/isolate-nodes.md | 2 ++ ee/ucp/authorization/isolate-volumes.md | 2 ++ ee/ucp/authorization/pull-images.md | 2 ++ ee/ucp/authorization/reset-user-password.md | 2 ++ ee/ucp/deploy-application-package.md | 2 ++ ee/ucp/index.md | 2 ++ ee/ucp/interlock/architecture.md | 2 ++ ee/ucp/interlock/config/host-mode-networking.md | 2 ++ ee/ucp/interlock/config/index.md | 2 ++ ee/ucp/interlock/config/nginx-config.md | 2 ++ ee/ucp/interlock/config/tuning.md | 2 ++ ee/ucp/interlock/config/updates.md | 2 ++ ee/ucp/interlock/deploy/index.md | 2 ++ ee/ucp/interlock/deploy/offline-install.md | 2 ++ ee/ucp/interlock/deploy/production.md | 2 ++ ee/ucp/interlock/deploy/upgrade.md | 2 ++ ee/ucp/interlock/index.md | 2 ++ ee/ucp/interlock/usage/canary.md | 2 ++ ee/ucp/interlock/usage/context.md | 2 ++ ee/ucp/interlock/usage/index.md | 2 ++ ee/ucp/interlock/usage/interlock-vip-mode.md | 2 ++ ee/ucp/interlock/usage/labels-reference.md | 2 ++ ee/ucp/interlock/usage/redirects.md | 2 ++ ee/ucp/interlock/usage/service-clusters.md | 2 ++ ee/ucp/interlock/usage/sessions.md | 2 ++ ee/ucp/interlock/usage/ssl.md | 2 ++ ee/ucp/interlock/usage/tls.md | 2 ++ ee/ucp/interlock/usage/websockets.md | 2 ++ ee/ucp/kubernetes/cluster-ingress/canary.md | 2 ++ ee/ucp/kubernetes/cluster-ingress/index.md | 2 ++ ee/ucp/kubernetes/cluster-ingress/ingress.md | 2 ++ ee/ucp/kubernetes/cluster-ingress/install.md | 2 ++ ee/ucp/kubernetes/cluster-ingress/sticky.md | 2 ++ ee/ucp/kubernetes/create-service-account.md | 2 ++ ee/ucp/kubernetes/deploy-with-compose.md | 2 ++ ee/ucp/kubernetes/index.md | 2 ++ ee/ucp/kubernetes/install-cni-plugin.md | 2 ++ ee/ucp/kubernetes/kube-resources.md | 2 ++ ee/ucp/kubernetes/kubernetes-network-encryption.md | 2 ++ ee/ucp/kubernetes/pod-security-policies.md | 2 ++ ee/ucp/kubernetes/storage/configure-aws-storage.md | 2 ++ ee/ucp/kubernetes/storage/use-azure-disk.md | 2 ++ ee/ucp/kubernetes/storage/use-azure-files.md | 2 ++ ee/ucp/kubernetes/storage/use-csi.md | 2 ++ ee/ucp/kubernetes/storage/use-iscsi.md | 2 ++ ee/ucp/kubernetes/storage/use-nfs-volumes.md | 2 ++ ee/ucp/kubernetes/storage/use-vsphere-volumes.md | 2 ++ ee/ucp/release-notes.md | 2 ++ ee/ucp/swarm/deploy-multi-service-app.md | 2 ++ ee/ucp/swarm/deploy-to-collection.md | 2 ++ ee/ucp/swarm/index.md | 2 ++ ee/ucp/swarm/use-secrets.md | 2 ++ ee/ucp/ucp-architecture.md | 2 ++ ee/ucp/user-access/cli.md | 2 ++ ee/ucp/user-access/index.md | 2 ++ ee/ucp/user-access/kubectl.md | 2 ++ engine/release-notes.md | 2 ++ reference/dtr/2.7/cli/backup.md | 2 ++ reference/dtr/2.7/cli/destroy.md | 2 ++ reference/dtr/2.7/cli/emergency-repair.md | 2 ++ reference/dtr/2.7/cli/images.md | 2 ++ reference/dtr/2.7/cli/index.md | 2 ++ reference/dtr/2.7/cli/install.md | 2 ++ reference/dtr/2.7/cli/join.md | 2 ++ reference/dtr/2.7/cli/reconfigure.md | 2 ++ reference/dtr/2.7/cli/remove.md | 2 ++ reference/dtr/2.7/cli/restore.md | 2 ++ reference/dtr/2.7/cli/upgrade.md | 2 ++ 209 files changed, 421 insertions(+), 1 deletion(-) create mode 100644 _includes/enterprise_label_shortform.md diff --git a/_includes/enterprise_label_shortform.md b/_includes/enterprise_label_shortform.md new file mode 100644 index 0000000000..b4f3cc9368 --- /dev/null +++ b/_includes/enterprise_label_shortform.md @@ -0,0 +1,4 @@ + +This topic applies to Docker Enterprise. + +The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. For more information on the acquisition and how it may affect you and your business, refer to the [Docker Enterprise Customer FAQ](https://www.docker.com/faq-for-docker-enterprise-customers-and-partners). \ No newline at end of file diff --git a/cluster/aws.md b/cluster/aws.md index 89f52ffbeb..86532db6e4 100644 --- a/cluster/aws.md +++ b/cluster/aws.md @@ -4,6 +4,8 @@ keywords: documentation, docs, docker, cluster, infrastructure, automation, AWS title: Get started with Docker Cluster on AWS --- +>{% include enterprise_label_shortform.md %} + ## Prerequisites - Completed installation of [Docker Desktop Enterprise](../ee/desktop/) on Windows or Mac, or the [Docker Enterprise Engine](https://docs.docker.com/ee/supported-platforms/) on Linux. diff --git a/cluster/azure.md b/cluster/azure.md index 51dd459514..36632ad321 100644 --- a/cluster/azure.md +++ b/cluster/azure.md @@ -4,6 +4,8 @@ keywords: documentation, docs, docker, cluster, infrastructure, automation, Azur title: Get started with Docker Cluster on Azure --- +>{% include enterprise_label_shortform.md %} + ## Prerequisites - Completed installation of [Docker Desktop Enterprise](../ee/desktop/) on Windows or Mac, or the [Docker Enterprise Engine](https://docs.docker.com/ee/supported-platforms/) on Linux. diff --git a/cluster/cluster-file.md b/cluster/cluster-file.md index 5ca0fb283d..129d43450b 100644 --- a/cluster/cluster-file.md +++ b/cluster/cluster-file.md @@ -6,6 +6,8 @@ toc_max: 5 toc_min: 1 --- +>{% include enterprise_label_shortform.md %} + This topic describes version 1 of the Cluster file format. ## Cluster file structure and examples diff --git a/cluster/index.md b/cluster/index.md index fffe656b30..2b8e765409 100644 --- a/cluster/index.md +++ b/cluster/index.md @@ -4,6 +4,8 @@ keywords: documentation, docs, docker, cluster, infrastructure, automation title: Overview of Docker Cluster --- +>{% include enterprise_label_shortform.md %} + Docker Cluster is a tool for lifecycle management of Docker clusters. With Cluster, you use a YAML file to configure your provider's resources. Then, with a single command, you provision and install all the resources diff --git a/cluster/reference/envvars.md b/cluster/reference/envvars.md index 5619de99ab..3f0991efb0 100644 --- a/cluster/reference/envvars.md +++ b/cluster/reference/envvars.md @@ -4,6 +4,8 @@ keywords: documentation, docs, docker, cluster, infrastructure, automation title: Cluster CLI environment variables --- +>{% include enterprise_label_shortform.md %} + Use the following environment variables as needed to configure the Docker Cluster command-line behavior. ## AWS\_ACCESS\_KEY\_ID diff --git a/cluster/release-notes.md b/cluster/release-notes.md index 04ee803028..fa09f2eb68 100644 --- a/cluster/release-notes.md +++ b/cluster/release-notes.md @@ -4,6 +4,8 @@ description: Learn about the new features, bug fixes, and breaking changes for D keywords: cluster, whats new, release notes --- +>{% include enterprise_label_shortform.md %} + This page provides information about Docker Cluster versions. # Version 1 diff --git a/ee/admin/backup/back-up-ucp.md b/ee/admin/backup/back-up-ucp.md index 2413140fe0..fbaac6e5f6 100644 --- a/ee/admin/backup/back-up-ucp.md +++ b/ee/admin/backup/back-up-ucp.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/admin/backups-and-disaster-recovery/ --- +>{% include enterprise_label_shortform.md %} + UCP backups no longer require pausing the reconciler and deleting UCP containers, and backing up a UCP manager does not disrupt the manager’s activities. Because UCP stores the same data on all manager nodes, you only need to back up a single UCP manager node. diff --git a/ee/admin/restore/restore-ucp.md b/ee/admin/restore/restore-ucp.md index 88973a128a..9581a62ba4 100644 --- a/ee/admin/restore/restore-ucp.md +++ b/ee/admin/restore/restore-ucp.md @@ -4,6 +4,8 @@ description: Learn how to restore UCP from a backup keywords: enterprise, restore, swarm --- +>{% include enterprise_label_shortform.md %} + To restore UCP, select one of the following options: * Run the restore on the machines from which the backup originated or on new machines. You can use the same swarm from which the backup originated or a new swarm. diff --git a/ee/docker-ee/centos.md b/ee/docker-ee/centos.md index bcb6f9bd4b..1601394061 100644 --- a/ee/docker-ee/centos.md +++ b/ee/docker-ee/centos.md @@ -16,6 +16,8 @@ title: Get Docker Engine - Enterprise for CentOS {% assign gpg-fingerprint = "77FE DA13 1A83 1D29 A418 D3E8 99E5 FF2E 7668 2BC9" %} +>{% include enterprise_label_shortform.md %} + There are two ways to install and upgrade [Docker Enterprise](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" } on {{ linux-dist-long }}: diff --git a/ee/docker-ee/oracle.md b/ee/docker-ee/oracle.md index a8e759a7fb..4fd4c2a3dc 100644 --- a/ee/docker-ee/oracle.md +++ b/ee/docker-ee/oracle.md @@ -17,6 +17,8 @@ title: Get Docker Engine - Enterprise for Oracle Linux {% assign gpg-fingerprint = "77FE DA13 1A83 1D29 A418 D3E8 99E5 FF2E 7668 2BC9" %} +>{% include enterprise_label_shortform.md %} + There are two ways to install and upgrade [Docker Enterprise](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" } on {{ linux-dist-long }}: diff --git a/ee/docker-ee/rhel.md b/ee/docker-ee/rhel.md index 39f7165ead..ecbd1dd1af 100644 --- a/ee/docker-ee/rhel.md +++ b/ee/docker-ee/rhel.md @@ -18,6 +18,8 @@ title: Get Docker Engine - Enterprise for Red Hat Enterprise Linux {% assign gpg-fingerprint = "77FE DA13 1A83 1D29 A418 D3E8 99E5 FF2E 7668 2BC9" %} +>{% include enterprise_label_shortform.md %} + There are two ways to install and upgrade [Docker Enterprise](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" } on {{ linux-dist-long }}: diff --git a/ee/docker-ee/suse.md b/ee/docker-ee/suse.md index 26c0059a25..62f9e86680 100644 --- a/ee/docker-ee/suse.md +++ b/ee/docker-ee/suse.md @@ -11,6 +11,8 @@ title: Get Docker Engine - Enterprise for SLES toc_max: 4 --- +>{% include enterprise_label_shortform.md %} + To get started with Docker on SUSE Linux Enterprise Server (SLES), make sure you [meet the prerequisites](#prerequisites), then [install Docker](#install-docker-ee). diff --git a/ee/docker-ee/ubuntu.md b/ee/docker-ee/ubuntu.md index 3b4251d3ad..6731e9f873 100644 --- a/ee/docker-ee/ubuntu.md +++ b/ee/docker-ee/ubuntu.md @@ -11,6 +11,8 @@ title: Get Docker Engine - Enterprise for Ubuntu toc_max: 4 --- +>{% include enterprise_label_shortform.md %} + To get started with Docker Engine - Enterprise on Ubuntu, make sure you [meet the prerequisites](#prerequisites), then [install Docker](#install-docker-ee). diff --git a/ee/docker-ee/windows/docker-ee.md b/ee/docker-ee/windows/docker-ee.md index 0524a74437..4b48bed388 100644 --- a/ee/docker-ee/windows/docker-ee.md +++ b/ee/docker-ee/windows/docker-ee.md @@ -11,6 +11,8 @@ redirect_from: {% capture filename %}{{ page.win_latest_build }}.zip{% endcapture %} {% capture download_url %}https://download.docker.com/components/engine/windows-server/{{ site.docker_ee_version }}/{{ filename }}{% endcapture %} +>{% include enterprise_label_shortform.md %} + Docker Engine - Enterprise enables native Docker containers on Windows Server. Windows Server 2016 and later versions are supported. The Docker Engine - Enterprise installation package includes everything you need to run Docker on diff --git a/ee/dtr/admin/configure/allow-creation-on-push.md b/ee/dtr/admin/configure/allow-creation-on-push.md index 6eab296d20..75a74e1bb2 100644 --- a/ee/dtr/admin/configure/allow-creation-on-push.md +++ b/ee/dtr/admin/configure/allow-creation-on-push.md @@ -7,6 +7,8 @@ redirect_from: - /datacenter/dtr/2.5/guides/admin/configure/allow-creation-on-push/ --- +>{% include enterprise_label_shortform.md %} + By default DTR only allows pushing images if the repository exists, and you have write access to the repository. diff --git a/ee/dtr/admin/configure/auto-delete-repo-events.md b/ee/dtr/admin/configure/auto-delete-repo-events.md index bff0a4b6a7..a04c477134 100644 --- a/ee/dtr/admin/configure/auto-delete-repo-events.md +++ b/ee/dtr/admin/configure/auto-delete-repo-events.md @@ -4,6 +4,8 @@ description: Enable auto-deletion of image events within a repository for mainte keywords: registry, events, log, activity stream --- +>{% include enterprise_label_shortform.md %} + ## Overview Docker Trusted Registry has a global setting for repository event auto-deletion. This allows event records to be removed as part of [garbage collection](../admin/configure/garbage-collection.md). DTR administrators can enable auto-deletion of repository events in DTR 2.6 based on specified conditions which are covered below. diff --git a/ee/dtr/admin/configure/deploy-caches/configuration-reference.md b/ee/dtr/admin/configure/deploy-caches/configuration-reference.md index 988cc65b1f..3d3d3cd925 100644 --- a/ee/dtr/admin/configure/deploy-caches/configuration-reference.md +++ b/ee/dtr/admin/configure/deploy-caches/configuration-reference.md @@ -4,6 +4,8 @@ description: Learn about the different configuration options for DTR caches. keywords: DTR, cache --- +>{% include enterprise_label_shortform.md %} + DTR caches are based on Docker Registry, and use the same configuration file format. [Learn more about the configuration options](/registry/configuration.md). diff --git a/ee/dtr/admin/configure/deploy-caches/high-availability.md b/ee/dtr/admin/configure/deploy-caches/high-availability.md index 02358e9dc2..e06627e38f 100644 --- a/ee/dtr/admin/configure/deploy-caches/high-availability.md +++ b/ee/dtr/admin/configure/deploy-caches/high-availability.md @@ -5,6 +5,8 @@ description: Learn how to deploy a DTR cache with fault tolerance and high keywords: DTR, cache --- +>{% include enterprise_label_shortform.md %} + If you're deploying a DTR cache in a zone with few users and with no uptime SLAs, a [single cache service is enough for you](simple.md). diff --git a/ee/dtr/admin/configure/deploy-caches/index.md b/ee/dtr/admin/configure/deploy-caches/index.md index 1c5f35974c..920c3d71c1 100644 --- a/ee/dtr/admin/configure/deploy-caches/index.md +++ b/ee/dtr/admin/configure/deploy-caches/index.md @@ -5,6 +5,8 @@ description: Deploy DTR caches in different geographical locations for users to keywords: DTR, cache --- +>{% include enterprise_label_shortform.md %} + The further away you are from the geographical location where DTR is deployed, the longer it will take to pull and push images. This happens because the files being transferred from DTR to your machine diff --git a/ee/dtr/admin/configure/deploy-caches/simple-kube.md b/ee/dtr/admin/configure/deploy-caches/simple-kube.md index 0236edb6bc..aaae7f628c 100644 --- a/ee/dtr/admin/configure/deploy-caches/simple-kube.md +++ b/ee/dtr/admin/configure/deploy-caches/simple-kube.md @@ -4,6 +4,8 @@ description: Deploy a DTR cache to allow users in remote geographical locations keywords: DTR, cache, kubernetes --- +>{% include enterprise_label_shortform.md %} + This example guides you through deploying a DTR cache, assuming that you've got a DTR deployment up and running. The below guide has been tested on Universal Control Plane 3.1, however it should work on any Kubernetes Cluster diff --git a/ee/dtr/admin/configure/deploy-caches/simple.md b/ee/dtr/admin/configure/deploy-caches/simple.md index 4c7bea82c1..0925f099aa 100644 --- a/ee/dtr/admin/configure/deploy-caches/simple.md +++ b/ee/dtr/admin/configure/deploy-caches/simple.md @@ -5,6 +5,8 @@ description: Deploy a DTR cache to make users in remove geographical locations keywords: DTR, cache --- +>{% include enterprise_label_shortform.md %} + This example guides you in deploying a DTR cache, assuming that you've got a DTR deployment up and running. It also assumes that you've provisioned [multiple nodes and joined them into a swarm](strategy.md#system-requirements). diff --git a/ee/dtr/admin/configure/deploy-caches/strategy.md b/ee/dtr/admin/configure/deploy-caches/strategy.md index 3da20d2e28..a5f81f6398 100644 --- a/ee/dtr/admin/configure/deploy-caches/strategy.md +++ b/ee/dtr/admin/configure/deploy-caches/strategy.md @@ -5,6 +5,8 @@ description: Learn how to deploy DTR caches across multiple datacenters to make keywords: DTR, cache --- +>{% include enterprise_label_shortform.md %} + The main reason to use a DTR cache is so that users can pull images from a service that's geographically closer to them. diff --git a/ee/dtr/admin/configure/disable-persistent-cookies.md b/ee/dtr/admin/configure/disable-persistent-cookies.md index 564c850559..eb8fe73e7a 100644 --- a/ee/dtr/admin/configure/disable-persistent-cookies.md +++ b/ee/dtr/admin/configure/disable-persistent-cookies.md @@ -3,6 +3,9 @@ title: Disable persistent cookies description: Learn how to disable persistent cookies for Docker Trusted Registry. keywords: dtr, browser cookies, sso --- + +>{% include enterprise_label_shortform.md %} + If you want your Docker Trusted Registry (DTR) to use session-based authentication cookies that expire when you close your browser, toggle "Disable persistent cookies". ![](/ee/dtr/images/disable-persistent-cookies-1.png){: .with-border} diff --git a/ee/dtr/admin/configure/enable-single-sign-on.md b/ee/dtr/admin/configure/enable-single-sign-on.md index 8e57cdc0b4..24985679ef 100644 --- a/ee/dtr/admin/configure/enable-single-sign-on.md +++ b/ee/dtr/admin/configure/enable-single-sign-on.md @@ -4,6 +4,8 @@ description: Learn how to set up single sign-on between UCP and DTR, so that you keywords: dtr, login, sso --- +>{% include enterprise_label_shortform.md %} + Users are shared between UCP and DTR by default, but the applications have separate browser-based interfaces which require authentication. To only authenticate once, you can configure DTR to have single sign-on (SSO) with UCP. diff --git a/ee/dtr/admin/configure/external-storage/index.md b/ee/dtr/admin/configure/external-storage/index.md index 5db397bdde..144dd3aaea 100644 --- a/ee/dtr/admin/configure/external-storage/index.md +++ b/ee/dtr/admin/configure/external-storage/index.md @@ -4,6 +4,8 @@ description: Storage configuration for Docker Trusted Registry keywords: dtr, storage drivers, NFS, Azure, S3 --- +>{% include enterprise_label_shortform.md %} + ## Configure your storage backend By default DTR uses the local filesystem of the node where it is running to diff --git a/ee/dtr/admin/configure/external-storage/nfs.md b/ee/dtr/admin/configure/external-storage/nfs.md index 21e2eb9338..ab155b9ea2 100644 --- a/ee/dtr/admin/configure/external-storage/nfs.md +++ b/ee/dtr/admin/configure/external-storage/nfs.md @@ -4,6 +4,8 @@ description: Learn how to integrate Docker Trusted Registry with NFS keywords: registry, dtr, storage, nfs --- +>{% include enterprise_label_shortform.md %} + You can configure DTR to store Docker images in an NFS directory. Starting in DTR 2.6, changing storage backends involves initializing a new metadatastore instead of reusing an existing volume. This helps facilitate [online garbage collection](/ee/dtr/admin/configure/garbage-collection/#under-the-hood). diff --git a/ee/dtr/admin/configure/external-storage/s3.md b/ee/dtr/admin/configure/external-storage/s3.md index 4d542cd160..55f7c5d8e0 100644 --- a/ee/dtr/admin/configure/external-storage/s3.md +++ b/ee/dtr/admin/configure/external-storage/s3.md @@ -5,6 +5,8 @@ description: Learn how to configure Docker Trusted Registry to store Docker imag keywords: dtr, storage driver, s3 --- +>{% include enterprise_label_shortform.md %} + You can configure DTR to store Docker images on Amazon S3, or other file servers with an S3-compatible API like Cleversafe or Minio. diff --git a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md index 4b2f9aadf7..a6b7682374 100644 --- a/ee/dtr/admin/configure/external-storage/storage-backend-migration.md +++ b/ee/dtr/admin/configure/external-storage/storage-backend-migration.md @@ -4,6 +4,8 @@ description: Storage backend migration for Docker Trusted Registry keywords: dtr, storage drivers, local volume, NFS, Azure, S3, --- +>{% include enterprise_label_shortform.md %} + Starting in DTR 2.6, switching storage backends initializes a new metadata store and erases your existing tags. This helps facilitate online garbage collection, which has been introduced in 2.5 as an experimental feature. In earlier versions, DTR would subsequently start a `tagmigration` job to rebuild tag metadata from the file layout in the image layer store. This job has been discontinued for DTR 2.5.x (with garbage collection) and DTR 2.6, as your storage backend could get out of sync with your DTR metadata, like your manifests and existing repositories. As best practice, DTR storage backends and metadata should always be moved, backed up, and restored together. ## DTR 2.6.4 and above diff --git a/ee/dtr/admin/configure/garbage-collection.md b/ee/dtr/admin/configure/garbage-collection.md index 25e044cd76..1cc3e5acdb 100644 --- a/ee/dtr/admin/configure/garbage-collection.md +++ b/ee/dtr/admin/configure/garbage-collection.md @@ -5,6 +5,8 @@ description: Save disk space by configuring the garbage collection settings in keywords: registry, online garbage collection, gc, space, disk space --- +>{% include enterprise_label_shortform.md %} + You can configure the Docker Trusted Registry (DTR) to automatically delete unused image layers, thus saving you disk space. This process is also known as garbage collection. diff --git a/ee/dtr/admin/configure/license-your-installation.md b/ee/dtr/admin/configure/license-your-installation.md index c96568e876..072e450141 100644 --- a/ee/dtr/admin/configure/license-your-installation.md +++ b/ee/dtr/admin/configure/license-your-installation.md @@ -4,6 +4,8 @@ description: Learn how to license your Docker Trusted Registry installation. keywords: dtr, install, license --- +>{% include enterprise_label_shortform.md %} + By default, Docker Trusted Registry (DTR) automatically uses the same license file applied to your Universal Control Plane (UCP). In the following scenarios, you need to manually apply a license to your DTR: diff --git a/ee/dtr/admin/configure/set-up-high-availability.md b/ee/dtr/admin/configure/set-up-high-availability.md index 5cfb9eef06..d92c3907fd 100644 --- a/ee/dtr/admin/configure/set-up-high-availability.md +++ b/ee/dtr/admin/configure/set-up-high-availability.md @@ -4,6 +4,8 @@ description: Lean how to scale Docker Trusted Registry by adding and removing re keywords: dtr, install, deploy --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry is designed to scale horizontally as your usage increases. You can add more replicas to make DTR scale to your demand and for high availability. diff --git a/ee/dtr/admin/configure/set-up-vulnerability-scans.md b/ee/dtr/admin/configure/set-up-vulnerability-scans.md index 30cbc5bd91..8ca2dbd349 100644 --- a/ee/dtr/admin/configure/set-up-vulnerability-scans.md +++ b/ee/dtr/admin/configure/set-up-vulnerability-scans.md @@ -6,6 +6,8 @@ redirect_from: - /datacenter/dtr/2.2/guides/admin/configure/set-up-vulnerability-scans/ --- +>{% include enterprise_label_shortform.md %} + This page explains how to set up and enable Docker Security Scanning on an existing installation of Docker Trusted Registry. diff --git a/ee/dtr/admin/configure/use-a-load-balancer.md b/ee/dtr/admin/configure/use-a-load-balancer.md index 5351e917fb..94f81df329 100644 --- a/ee/dtr/admin/configure/use-a-load-balancer.md +++ b/ee/dtr/admin/configure/use-a-load-balancer.md @@ -4,6 +4,8 @@ description: Learn how to configure a load balancer to balance user requests acr keywords: dtr, load balancer --- +>{% include enterprise_label_shortform.md %} + Once you’ve joined multiple DTR replicas nodes for [high-availability](set-up-high-availability.md), you can configure your own load balancer to balance user requests across all replicas. diff --git a/ee/dtr/admin/configure/use-a-web-proxy.md b/ee/dtr/admin/configure/use-a-web-proxy.md index 56f8c86a51..b66d46e3ea 100644 --- a/ee/dtr/admin/configure/use-a-web-proxy.md +++ b/ee/dtr/admin/configure/use-a-web-proxy.md @@ -5,6 +5,8 @@ description: Learn how to configure Docker Content Trust to use a web proxy to keywords: dtr, configure, http, proxy --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry makes outgoing connections to check for new versions, automatically renew its license, and update its vulnerability database. If DTR can't access the internet, then you'll have to manually apply updates. diff --git a/ee/dtr/admin/configure/use-your-own-tls-certificates.md b/ee/dtr/admin/configure/use-your-own-tls-certificates.md index 4bff6b11a7..ffd54718c8 100644 --- a/ee/dtr/admin/configure/use-your-own-tls-certificates.md +++ b/ee/dtr/admin/configure/use-your-own-tls-certificates.md @@ -4,6 +4,8 @@ description: Learn how to configure Docker Trusted Registry with your own TLS ce keywords: dtr, tls, certificates, security --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry (DTR) services are exposed using HTTPS by default. This ensures encrypted communications between clients and your trusted registry. If you do not pass a PEM-encoded TLS certificate during installation, DTR will diff --git a/ee/dtr/admin/disaster-recovery/create-a-backup.md b/ee/dtr/admin/disaster-recovery/create-a-backup.md index 75787441db..c85cc13b73 100644 --- a/ee/dtr/admin/disaster-recovery/create-a-backup.md +++ b/ee/dtr/admin/disaster-recovery/create-a-backup.md @@ -5,6 +5,8 @@ keywords: dtr, disaster recovery toc_max_header: 3 --- +>{% include enterprise_label_shortform.md %} + {% assign metadata_backup_file = "dtr-metadata-backup.tar" %} {% assign image_backup_file = "dtr-image-backup.tar" %} diff --git a/ee/dtr/admin/disaster-recovery/index.md b/ee/dtr/admin/disaster-recovery/index.md index 6e66181e94..dd837bd72e 100644 --- a/ee/dtr/admin/disaster-recovery/index.md +++ b/ee/dtr/admin/disaster-recovery/index.md @@ -5,6 +5,8 @@ description: Learn the multiple disaster recovery strategies you can use with keywords: dtr, disaster recovery --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry is a clustered application. You can join multiple replicas for high availability. diff --git a/ee/dtr/admin/disaster-recovery/repair-a-cluster.md b/ee/dtr/admin/disaster-recovery/repair-a-cluster.md index e6bdf42edb..a84bd794ab 100644 --- a/ee/dtr/admin/disaster-recovery/repair-a-cluster.md +++ b/ee/dtr/admin/disaster-recovery/repair-a-cluster.md @@ -6,6 +6,8 @@ redirect_from: - /datacenter/dtr/2.5/guides/admin/disaster-recovery/repair-a-cluster/ --- +>{% include enterprise_label_shortform.md %} + For a DTR cluster to be healthy, a majority of its replicas (n/2 + 1) need to be healthy and be able to communicate with the other replicas. This is known as maintaining quorum. diff --git a/ee/dtr/admin/disaster-recovery/repair-a-single-replica.md b/ee/dtr/admin/disaster-recovery/repair-a-single-replica.md index f61c21c13b..1b288d354a 100644 --- a/ee/dtr/admin/disaster-recovery/repair-a-single-replica.md +++ b/ee/dtr/admin/disaster-recovery/repair-a-single-replica.md @@ -4,6 +4,8 @@ description: Learn how to repair a single DTR replica when it is unhealthy. keywords: dtr, disaster recovery --- +>{% include enterprise_label_shortform.md %} + When one or more DTR replicas are unhealthy but the overall majority (n/2 + 1) is healthy and able to communicate with one another, your DTR cluster is still functional and healthy. diff --git a/ee/dtr/admin/disaster-recovery/restore-from-backup.md b/ee/dtr/admin/disaster-recovery/restore-from-backup.md index 2986726e80..220a42e024 100644 --- a/ee/dtr/admin/disaster-recovery/restore-from-backup.md +++ b/ee/dtr/admin/disaster-recovery/restore-from-backup.md @@ -7,6 +7,8 @@ keywords: dtr, disaster recovery {% assign metadata_backup_file = "dtr-metadata-backup.tar" %} {% assign image_backup_file = "dtr-image-backup.tar" %} +>{% include enterprise_label_shortform.md %} + ## Restore DTR data If your DTR has a majority of unhealthy replicas, the one way to restore it to diff --git a/ee/dtr/admin/install/index.md b/ee/dtr/admin/install/index.md index 08ded7ce95..283f9a8c25 100644 --- a/ee/dtr/admin/install/index.md +++ b/ee/dtr/admin/install/index.md @@ -4,6 +4,8 @@ description: Learn how to install Docker Trusted Registry for production. keywords: dtr, registry, install --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry (DTR) is a containerized application that runs on a swarm managed by the Universal Control Plane (UCP). It can be installed on-premises or on a cloud infrastructure. diff --git a/ee/dtr/admin/install/install-offline.md b/ee/dtr/admin/install/install-offline.md index 5e840ed5c8..db70ca7a20 100644 --- a/ee/dtr/admin/install/install-offline.md +++ b/ee/dtr/admin/install/install-offline.md @@ -5,6 +5,8 @@ description: Learn how to install Docker Trusted Registry on a machine with no i keywords: registry, install, offline --- +>{% include enterprise_label_shortform.md %} + The procedure to install Docker Trusted Registry on a host is the same, whether that host has access to the internet or not. diff --git a/ee/dtr/admin/install/system-requirements.md b/ee/dtr/admin/install/system-requirements.md index 01635e3240..9de5c4d413 100644 --- a/ee/dtr/admin/install/system-requirements.md +++ b/ee/dtr/admin/install/system-requirements.md @@ -4,6 +4,8 @@ description: Learn about the system requirements for installing Docker Trusted R keywords: DTR, architecture, requirements --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry can be installed on-premises or on the cloud. Before installing, be sure your infrastructure has these requirements. diff --git a/ee/dtr/admin/install/uninstall.md b/ee/dtr/admin/install/uninstall.md index 0e8dda9ed5..731b9a11ef 100644 --- a/ee/dtr/admin/install/uninstall.md +++ b/ee/dtr/admin/install/uninstall.md @@ -4,6 +4,8 @@ description: Learn how to uninstall your Docker Trusted Registry installation. keywords: dtr, install, uninstall --- +>{% include enterprise_label_shortform.md %} + Uninstalling DTR can be done by simply removing all data associated with each replica. To do that, you just run the destroy command once per replica: diff --git a/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md b/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md index 5477445bda..1657308fc3 100644 --- a/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md +++ b/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md @@ -6,6 +6,8 @@ redirect_from: /ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs/ --- +>{% include enterprise_label_shortform.md %} + ## Overview This covers troubleshooting batch jobs via the API and was introduced in DTR 2.2. Starting in DTR 2.6, admins have the ability to [audit jobs](audit-jobs-via-ui.md) using the web interface. diff --git a/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md b/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md index 7d5f2b261b..c9b40648e9 100644 --- a/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md +++ b/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md @@ -4,6 +4,8 @@ description: View a list of jobs happening within DTR and review the detailed lo keywords: dtr, troubleshoot, audit, job logs, jobs, ui --- +>{% include enterprise_label_shortform.md %} + As of DTR 2.2, admins were able to [view and audit jobs within DTR](audit-jobs-via-api) using the API. DTR 2.6 enhances those capabilities by adding a **Job Logs** tab under **System** settings on the user interface. The tab displays a sortable and paginated list of jobs along with links to associated job logs. ## Prerequisite diff --git a/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md b/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md index d337217b11..395df2f3fd 100644 --- a/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md +++ b/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md @@ -4,6 +4,8 @@ description: Enable auto-deletion of old or unnecessary job logs for maintenance keywords: dtr, jobs, log, job logs, system --- +>{% include enterprise_label_shortform.md %} + ## Overview Docker Trusted Registry has a global setting for auto-deletion of job logs which allows them to be removed as part of [garbage collection](../configure/garbage-collection.md). DTR admins can enable auto-deletion of repository events in DTR 2.6 based on specified conditions which are covered below. diff --git a/ee/dtr/admin/manage-jobs/job-queue.md b/ee/dtr/admin/manage-jobs/job-queue.md index da078bb90b..b8eaf03d17 100644 --- a/ee/dtr/admin/manage-jobs/job-queue.md +++ b/ee/dtr/admin/manage-jobs/job-queue.md @@ -4,6 +4,8 @@ description: Learn how Docker Trusted Registry runs batch jobs for troubleshooti keywords: dtr, job queue, job management --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry (DTR) uses a job queue to schedule batch jobs. Jobs are added to a cluster-wide job queue, and then consumed and executed by a job runner within DTR. ![batch jobs diagram](../../images/troubleshoot-batch-jobs-1.svg) diff --git a/ee/dtr/admin/manage-users/create-and-manage-orgs.md b/ee/dtr/admin/manage-users/create-and-manage-orgs.md index ccabf3a7a5..0a46de26cf 100644 --- a/ee/dtr/admin/manage-users/create-and-manage-orgs.md +++ b/ee/dtr/admin/manage-users/create-and-manage-orgs.md @@ -5,6 +5,8 @@ description: Learn how to set up organizations to enforce security in Docker Tru keywords: registry, security, permissions, organizations --- +>{% include enterprise_label_shortform.md %} + When a user creates a repository, only that user has permissions to make changes to the repository. diff --git a/ee/dtr/admin/manage-users/create-and-manage-teams.md b/ee/dtr/admin/manage-users/create-and-manage-teams.md index 3ffaddc48d..75ce97623c 100644 --- a/ee/dtr/admin/manage-users/create-and-manage-teams.md +++ b/ee/dtr/admin/manage-users/create-and-manage-teams.md @@ -5,6 +5,8 @@ description: Learn how to manage teams to enforce fine-grain access control in D keywords: registry, security, permissions, teams --- +>{% include enterprise_label_shortform.md %} + You can extend a user's default permissions by granting them individual permissions in other image repositories, by adding the user to a team. A team defines the permissions a set of users have for a set of repositories. diff --git a/ee/dtr/admin/manage-users/create-and-manage-users.md b/ee/dtr/admin/manage-users/create-and-manage-users.md index e037ed87d2..d153b21fd6 100644 --- a/ee/dtr/admin/manage-users/create-and-manage-users.md +++ b/ee/dtr/admin/manage-users/create-and-manage-users.md @@ -4,6 +4,8 @@ description: Learn how to manage user permissions in Docker Trusted Registry. keywords: registry, security, permissions, users --- +>{% include enterprise_label_shortform.md %} + When using the built-in authentication, you can create users to grant them fine-grained permissions. diff --git a/ee/dtr/admin/manage-users/index.md b/ee/dtr/admin/manage-users/index.md index 306ffb8bb2..eb87ce61f4 100644 --- a/ee/dtr/admin/manage-users/index.md +++ b/ee/dtr/admin/manage-users/index.md @@ -4,6 +4,8 @@ description: Learn about the permission levels available on Docker Trusted Regis keywords: registry, security, permissions, users --- +>{% include enterprise_label_shortform.md %} + With DTR you get to control which users have access to your image repositories. By default, anonymous users can only pull images from public repositories. diff --git a/ee/dtr/admin/manage-users/permission-levels.md b/ee/dtr/admin/manage-users/permission-levels.md index 50e60d7929..184e904abb 100644 --- a/ee/dtr/admin/manage-users/permission-levels.md +++ b/ee/dtr/admin/manage-users/permission-levels.md @@ -4,6 +4,8 @@ description: Learn about the permission levels available in Docker Trusted Regis keywords: registry, security, permissions --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry allows you to define fine-grain permissions over image repositories. diff --git a/ee/dtr/admin/manage-webhooks/index.md b/ee/dtr/admin/manage-webhooks/index.md index a9eaa8d778..96a59ecd8c 100644 --- a/ee/dtr/admin/manage-webhooks/index.md +++ b/ee/dtr/admin/manage-webhooks/index.md @@ -7,6 +7,8 @@ redirect_from: - /ee/dtr/user/create-and-manage-webhooks/ --- +>{% include enterprise_label_shortform.md %} + You can configure DTR to automatically post event notifications to a webhook URL of your choosing. This lets you build complex CI and CD pipelines with your Docker images. The following is a complete list of event types you can trigger webhook notifications for via the [web interface](use-the-web-ui) or the [API](use-the-API). ## Webhook types diff --git a/ee/dtr/admin/manage-webhooks/use-the-api.md b/ee/dtr/admin/manage-webhooks/use-the-api.md index f710fc1c07..02b1957af6 100644 --- a/ee/dtr/admin/manage-webhooks/use-the-api.md +++ b/ee/dtr/admin/manage-webhooks/use-the-api.md @@ -4,6 +4,8 @@ description: Learn how to create, configure, and test webhooks for DTR using the keywords: dtr, webhooks, api, registry --- +>{% include enterprise_label_shortform.md %} + ## Prerequisite See [Webhook types](/ee/dtr/admin/manage-webhooks/index.md/#webhook-types) for a list of events you can trigger notifications for via the API. diff --git a/ee/dtr/admin/manage-webhooks/use-the-web-ui.md b/ee/dtr/admin/manage-webhooks/use-the-web-ui.md index b3c8dfe26f..2e5f213bee 100644 --- a/ee/dtr/admin/manage-webhooks/use-the-web-ui.md +++ b/ee/dtr/admin/manage-webhooks/use-the-web-ui.md @@ -4,6 +4,8 @@ description: Learn how to create, configure, and test repository webhooks for DT keywords: dtr, webhooks, ui, web interface, registry --- +>{% include enterprise_label_shortform.md %} + ## Prerequisites - You must have admin privileges to the repository in order to create a webhook. diff --git a/ee/dtr/admin/monitor-and-troubleshoot/index.md b/ee/dtr/admin/monitor-and-troubleshoot/index.md index 4e58b544fc..7962abc597 100644 --- a/ee/dtr/admin/monitor-and-troubleshoot/index.md +++ b/ee/dtr/admin/monitor-and-troubleshoot/index.md @@ -4,6 +4,8 @@ description: Learn how to monitor your DTR installation. keywords: registry, monitor, troubleshoot --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry is a Dockerized application. To monitor it, you can use the same tools and techniques you're already using to monitor other containerized applications running on your cluster. One way to monitor diff --git a/ee/dtr/admin/monitor-and-troubleshoot/notary-audit-logs.md b/ee/dtr/admin/monitor-and-troubleshoot/notary-audit-logs.md index 2465734963..e1b420d5da 100644 --- a/ee/dtr/admin/monitor-and-troubleshoot/notary-audit-logs.md +++ b/ee/dtr/admin/monitor-and-troubleshoot/notary-audit-logs.md @@ -5,6 +5,8 @@ description: When you push signed images, Docker Trusted Registry keeps audit keywords: registry, monitor, troubleshoot --- +>{% include enterprise_label_shortform.md %} + Docker Content Trust (DCT) keeps audit logs of changes made to trusted repositories. Every time you push a signed image to a repository, or delete trust data for a repository, DCT logs that information. diff --git a/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md b/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md index 5b522b3c87..87326c3fb9 100644 --- a/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md +++ b/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs.md @@ -4,6 +4,8 @@ description: Learn how Docker Trusted Registry run batch jobs, so that you can t keywords: dtr, troubleshoot --- +>{% include enterprise_label_shortform.md %} + DTR uses a job queue to schedule batch jobs. A job is placed on this work queue, and a job runner component of DTR consumes work from this cluster-wide job queue and executes it. diff --git a/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-dtr.md b/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-dtr.md index a8318eaa20..fb9ace971b 100644 --- a/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-dtr.md +++ b/ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-dtr.md @@ -5,6 +5,8 @@ keywords: registry, monitor, troubleshoot redirect_from: /ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-with-logs --- +>{% include enterprise_label_shortform.md %} + This guide contains tips and tricks for troubleshooting DTR problems. ## Troubleshoot overlay networks diff --git a/ee/dtr/admin/upgrade.md b/ee/dtr/admin/upgrade.md index 57c3615098..915f54ade9 100644 --- a/ee/dtr/admin/upgrade.md +++ b/ee/dtr/admin/upgrade.md @@ -6,6 +6,8 @@ keywords: dtr, upgrade, install {% assign previous_version="2.6" %} +>{% include enterprise_label_shortform.md %} + DTR uses [semantic versioning](http://semver.org/) and Docker aims to achieve specific guarantees while upgrading between versions. While downgrades are not supported, Docker supports upgrades according to the following rules: diff --git a/ee/dtr/architecture.md b/ee/dtr/architecture.md index 78081bc0ce..ba24070408 100644 --- a/ee/dtr/architecture.md +++ b/ee/dtr/architecture.md @@ -4,6 +4,8 @@ description: Learn about the architecture of Docker Trusted Registry. keywords: registry, dtr, architecture --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry (DTR) is a containerized application that runs on a Docker Universal Control Plane cluster. diff --git a/ee/dtr/index.md b/ee/dtr/index.md index 9fd3320ecf..26a74ba7c4 100644 --- a/ee/dtr/index.md +++ b/ee/dtr/index.md @@ -4,6 +4,8 @@ description: Learn how to install, configure, and use Docker Trusted Registry. keywords: registry, repository, images --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry (DTR) is the enterprise-grade image storage solution from Docker. You install it behind your firewall so that you can securely store and manage the Docker images you use in your applications. diff --git a/ee/dtr/release-notes.md b/ee/dtr/release-notes.md index b94c6a380e..48fb0f84cf 100644 --- a/ee/dtr/release-notes.md +++ b/ee/dtr/release-notes.md @@ -9,6 +9,8 @@ redirect_from: - /datacenter/dtr/2.5/guides/release-notes/ --- +>{% include enterprise_label_shortform.md %} + Here you can learn about new features, bug fixes, breaking changes, and known issues for each DTR version. diff --git a/ee/dtr/user/access-dtr/index.md b/ee/dtr/user/access-dtr/index.md index d8a969cd4a..1b28216a88 100644 --- a/ee/dtr/user/access-dtr/index.md +++ b/ee/dtr/user/access-dtr/index.md @@ -4,6 +4,8 @@ description: Learn how to configure your Docker Engine to push and pull images f keywords: registry, TLS, certificates --- +>{% include enterprise_label_shortform.md %} + By default Docker Engine uses TLS when pushing and pulling images to an image registry like Docker Trusted Registry. diff --git a/ee/dtr/user/access-dtr/use-a-cache.md b/ee/dtr/user/access-dtr/use-a-cache.md index 7d8037ab0d..1b174c4712 100644 --- a/ee/dtr/user/access-dtr/use-a-cache.md +++ b/ee/dtr/user/access-dtr/use-a-cache.md @@ -4,6 +4,8 @@ description: Learn how to configure your Docker Trusted Registry account to pull keywords: registry, cache --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry can be configured to have one or more caches. This allows you to choose from which cache to pull images from for faster download times. diff --git a/ee/dtr/user/access-tokens.md b/ee/dtr/user/access-tokens.md index 7365ef9c65..27ca306039 100644 --- a/ee/dtr/user/access-tokens.md +++ b/ee/dtr/user/access-tokens.md @@ -7,6 +7,8 @@ redirect_from: - /datacenter/dtr/2.5/guides/user/access-tokens/ --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry lets you create and distribute access tokens to enable programmatic access to DTR. Access tokens are linked to a particular user account and duplicate whatever permissions that account has at the time of use. If the account changes permissions, so will the token. Access tokens are useful in cases such as building integrations since you can issue multiple tokens – one for each integration – and revoke them at any time. diff --git a/ee/dtr/user/audit-repository-events.md b/ee/dtr/user/audit-repository-events.md index b664b48eff..91b6a0b7f4 100644 --- a/ee/dtr/user/audit-repository-events.md +++ b/ee/dtr/user/audit-repository-events.md @@ -4,6 +4,8 @@ description: View and audit your repository events. keywords: dtr, events, log, activity stream --- +>{% include enterprise_label_shortform.md %} + ## Overview Starting in DTR 2.6, each repository page includes an **Activity** tab which displays a sortable and paginated list of the most recent events within the repository. This offers better visibility along with the ability to audit events. Event types listed will vary according to your [repository permission level](/ee/dtr/admin/manage-users/permission-levels/). Additionally, DTR admins can [enable auto-deletion of repository events](/ee/dtr/admin/configure/auto-delete-repo-events/) as part of maintenance and cleanup. diff --git a/ee/dtr/user/manage-applications.md b/ee/dtr/user/manage-applications.md index 7a0f14d9ec..9a4983cd40 100644 --- a/ee/dtr/user/manage-applications.md +++ b/ee/dtr/user/manage-applications.md @@ -4,6 +4,8 @@ description: Learn how to manage applications in Docker Trusted Registry. keywords: DTR, trusted registry, Docker apps --- +>{% include enterprise_label_shortform.md %} + With the introduction of [the experimental `app` plugin](/engine/reference/commandline/app/) to the Docker CLI, DTR has been enhanced to include application management. In DTR 2.7, you can push an app to your DTR repository and have an application be clearly distinguished from [individual and multi-architecture container images](/ee/dtr/user/manage-images/pull-and-push-images/#push-an-image/), as well as [plugins](/engine/reference/commandline/plugin_push/). When you push an application to DTR, you see two image tags: | Image | Tag | Type | Under the hood | diff --git a/ee/dtr/user/manage-images/delete-images.md b/ee/dtr/user/manage-images/delete-images.md index 0a9701da5b..e44a32264b 100644 --- a/ee/dtr/user/manage-images/delete-images.md +++ b/ee/dtr/user/manage-images/delete-images.md @@ -4,6 +4,8 @@ description: Learn how to delete images from Docker Trusted Registry. keywords: registry, delete --- +>{% include enterprise_label_shortform.md %} + To delete an image, navigate to the **Tags** tab of the repository page on the DTR web interface. In the **Tags** tab, select all the image tags you want to delete, and click the **Delete** button. diff --git a/ee/dtr/user/manage-images/index.md b/ee/dtr/user/manage-images/index.md index d1550bcdfc..967d7e1510 100644 --- a/ee/dtr/user/manage-images/index.md +++ b/ee/dtr/user/manage-images/index.md @@ -7,6 +7,8 @@ redirect_from: - /ee/dtr/deprecation-notice/ --- +>{% include enterprise_label_shortform.md %} + Since DTR is secure by default, you need to create the image repository before being able to push the image to DTR. diff --git a/ee/dtr/user/manage-images/override-a-vulnerability.md b/ee/dtr/user/manage-images/override-a-vulnerability.md index 33f75674f9..16b840c7f1 100644 --- a/ee/dtr/user/manage-images/override-a-vulnerability.md +++ b/ee/dtr/user/manage-images/override-a-vulnerability.md @@ -5,6 +5,8 @@ description: Learn how to dismiss a vulnerability reported by the security keywords: registry, security scanner --- +>{% include enterprise_label_shortform.md %} + DTR scans your images for vulnerabilities but sometimes it can report that your image has vulnerabilities you know have been fixed. If that happens you can dismiss the warning. diff --git a/ee/dtr/user/manage-images/prevent-tags-from-being-overwritten.md b/ee/dtr/user/manage-images/prevent-tags-from-being-overwritten.md index 8f94003534..a5308809af 100644 --- a/ee/dtr/user/manage-images/prevent-tags-from-being-overwritten.md +++ b/ee/dtr/user/manage-images/prevent-tags-from-being-overwritten.md @@ -10,6 +10,8 @@ keywords: registry, immutable {% assign repo="wordpress" %} {% assign tag="latest" %} +>{% include enterprise_label_shortform.md %} + By default, users with [read and write access](../../admin/manage-users/permission-levels/) to a repository can push the same tag multiple times to that repository. For example, when ***user A*** pushes an image to `{{ org }}/{{ repo }}:{{ tag }}`, there is no preventing ***user B*** from pushing an image with the same name but a completely different functionality. This can make it difficult to trace the image back to the build that generated diff --git a/ee/dtr/user/manage-images/pull-and-push-images.md b/ee/dtr/user/manage-images/pull-and-push-images.md index a27c5f05ca..0900fc44b6 100644 --- a/ee/dtr/user/manage-images/pull-and-push-images.md +++ b/ee/dtr/user/manage-images/pull-and-push-images.md @@ -11,6 +11,8 @@ redirect_from: {% assign repo="wordpress" %} {% assign tag="latest" %} +>{% include enterprise_label_shortform.md %} + You interact with Docker Trusted registry in the same way you interact with Docker Hub or any other registry: diff --git a/ee/dtr/user/manage-images/review-repository-info.md b/ee/dtr/user/manage-images/review-repository-info.md index a2141a20c4..2bcbebaba9 100644 --- a/ee/dtr/user/manage-images/review-repository-info.md +++ b/ee/dtr/user/manage-images/review-repository-info.md @@ -4,6 +4,8 @@ description: View your repository permissions. keywords: dtr, repository, permissions --- +>{% include enterprise_label_shortform.md %} + The **Repository Info** tab includes the following details: * README (which you can [edit if you have admin rights to the repository](../../admin/manage-users/permission-levels/#team-permission-levels)) * Docker Pull Command diff --git a/ee/dtr/user/manage-images/scan-images-for-vulnerabilities.md b/ee/dtr/user/manage-images/scan-images-for-vulnerabilities.md index ce01f5ee39..6b1e433e58 100644 --- a/ee/dtr/user/manage-images/scan-images-for-vulnerabilities.md +++ b/ee/dtr/user/manage-images/scan-images-for-vulnerabilities.md @@ -4,6 +4,8 @@ description: Learn how to scan your Docker images for vulnerabilities. keywords: registry, scan, vulnerability --- +>{% include enterprise_label_shortform.md %} + [![Image Security Scanning](../../images/scanning_video.png)](https://www.youtube.com/watch?v=121poCB0Nn8 "Images Security Scanning"){: target="_blank" ._} Docker Trusted Registry can scan images in your repositories to verify that they diff --git a/ee/dtr/user/manage-images/sign-images/index.md b/ee/dtr/user/manage-images/sign-images/index.md index f2409bfc34..f683122168 100644 --- a/ee/dtr/user/manage-images/sign-images/index.md +++ b/ee/dtr/user/manage-images/sign-images/index.md @@ -7,6 +7,8 @@ redirect_from: - /ee/dtr/user/manage-images/sign-images/manage-trusted-repositories/ --- +>{% include enterprise_label_shortform.md %} + Two key components of the Docker Trusted Registry are the Notary Server and the Notary Signer. These two containers provide the required components for using Docker Content Trust (DCT) out of the box. [Docker Content diff --git a/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md b/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md index 011cdb3535..91df3d4cfe 100644 --- a/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md +++ b/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/admin/configure/integrate-with-multiple-registries/ --- +>{% include enterprise_label_shortform.md %} + For more advanced deployments, you may want to share one Docker Trusted Registry across multiple Universal Control Planes. However, customers wanting to adopt this model alongside the [Only Run Signed diff --git a/ee/dtr/user/promotion-policies/index.md b/ee/dtr/user/promotion-policies/index.md index a5704ae9e1..73a1b569cf 100644 --- a/ee/dtr/user/promotion-policies/index.md +++ b/ee/dtr/user/promotion-policies/index.md @@ -5,6 +5,8 @@ description: Learn how to create a promotion policies that can automatically keywords: registry, promotion, mirror --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry allows you to automatically promote and mirror images based on a policy. In DTR 2.7, you have the option to promote applications with [the experimental `docker app` CLI addition](/ee/dtr/user/manage-applications/). Note that scanning-based promotion policies do not take effect until all application-bundled images have been scanned. diff --git a/ee/dtr/user/promotion-policies/internal-promotion.md b/ee/dtr/user/promotion-policies/internal-promotion.md index 34afec5d07..df423946ea 100644 --- a/ee/dtr/user/promotion-policies/internal-promotion.md +++ b/ee/dtr/user/promotion-policies/internal-promotion.md @@ -8,6 +8,8 @@ redirect_from: - /datacenter/dtr/2.5/guides/user/create-promotion-policies/ --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry allows you to create image promotion pipelines based on policies. diff --git a/ee/dtr/user/promotion-policies/pull-mirror.md b/ee/dtr/user/promotion-policies/pull-mirror.md index ca9999ac4a..dc3bd463ae 100644 --- a/ee/dtr/user/promotion-policies/pull-mirror.md +++ b/ee/dtr/user/promotion-policies/pull-mirror.md @@ -4,6 +4,8 @@ description: Learn how to set up a repository to poll for changes in another reg keywords: registry, promotion, mirror --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry allows you to set up a mirror of a repository by constantly polling it and pulling new image tags as they are pushed. This ensures your images are replicated across different registries for high availability. It also makes it easy to create a development pipeline that allows different users access to a certain image without giving them access to everything in the remote registry. diff --git a/ee/dtr/user/promotion-policies/push-mirror.md b/ee/dtr/user/promotion-policies/push-mirror.md index c8806e0b50..d04e6efa11 100644 --- a/ee/dtr/user/promotion-policies/push-mirror.md +++ b/ee/dtr/user/promotion-policies/push-mirror.md @@ -4,6 +4,8 @@ description: Learn how to create a promotion policy that promotes images to an e keywords: registry, promotion, mirror --- +>{% include enterprise_label_shortform.md %} + Docker Trusted Registry allows you to create mirroring policies for a repository. When an image gets pushed to a repository and meets the mirroring criteria, DTR automatically pushes it to a repository in a remote Docker Trusted or Hub registry. diff --git a/ee/dtr/user/promotion-policies/templates.md b/ee/dtr/user/promotion-policies/templates.md index 1ef5d747c1..aab3e88b01 100644 --- a/ee/dtr/user/promotion-policies/templates.md +++ b/ee/dtr/user/promotion-policies/templates.md @@ -4,6 +4,8 @@ description: Learn how to use templates when setting your promotion policies to keywords: registry, promotion, mirror --- +>{% include enterprise_label_shortform.md %} + When defining promotion policies you can use templates to dynamically name the tag that is going to be created. diff --git a/ee/dtr/user/tag-pruning.md b/ee/dtr/user/tag-pruning.md index 7eece3b81f..75d75b3c51 100644 --- a/ee/dtr/user/tag-pruning.md +++ b/ee/dtr/user/tag-pruning.md @@ -6,6 +6,8 @@ keywords: registry, tag pruning, tag limit, repo management ## Overview +>{% include enterprise_label_shortform.md %} + Tag pruning is the process of cleaning up unnecessary or unwanted repository tags. As of v2.6, you can configure the Docker Trusted Registry (DTR) to automatically perform tag pruning on repositories that you manage by: * specifying a tag pruning policy or alternatively, diff --git a/ee/index.md b/ee/index.md index 586cc53bcc..36248df2ca 100644 --- a/ee/index.md +++ b/ee/index.md @@ -7,6 +7,7 @@ redirect_from: - /manuals/ --- +>{% include enterprise_label_shortform.md %} The Docker Enterprise platform is the leading container platform for continuous, high-velocity innovation. Docker is the only independent container platform that enables developers to seamlessly build and share any application — from legacy to modern — and operators to securely run them anywhere - from hybrid cloud to the edge. diff --git a/ee/licensing.md b/ee/licensing.md index 23bb8f8fa0..513b1f075b 100644 --- a/ee/licensing.md +++ b/ee/licensing.md @@ -6,6 +6,8 @@ toc_min: 1 toc_max: 2 --- +>{% include enterprise_label_shortform.md %} + This page provides information about Docker Enterprise 3.0 licensing. Docker Enterprise 3.0 is a soft bundle of products that deliver the complete desktop-to-cloud workflow. > Important diff --git a/ee/release-notes.md b/ee/release-notes.md index 55c98ff4fc..f3033378b8 100644 --- a/ee/release-notes.md +++ b/ee/release-notes.md @@ -4,6 +4,8 @@ description: Learn about the new features, bug fixes, and breaking changes for D keywords: engine enterprise, ucp, dtr, desktop enterprise, whats new, release notes --- +>{% include enterprise_label_shortform.md %} + This page provides information about Docker Enterprise 3.0. For detailed information about for each enterprise component, refer to the individual component release notes pages listed in the following **Docker Enterprise components install and upgrade** section. diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index d0cd5521ef..fb32c6cca8 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -13,6 +13,8 @@ green-check: '![yes](/install/images/green-check.svg){: style="height: 14px; mar install-prefix-ee: '/install/linux/docker-ee' --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise is designed for enterprise development as well as IT teams who build, share, and run business-critical applications at scale in production. Docker Enterprise is an integrated container platform that includes Docker Desktop Enterprise, a secure image registry, advanced management control plane, and Docker Engine - Enterprise. diff --git a/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md b/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md index 2d8b9b4504..dab2797520 100644 --- a/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md +++ b/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md @@ -4,6 +4,8 @@ description: Learn how to add metadata to cluster nodes that can be used to spec keywords: cluster, node, label, swarm, metadata --- +>{% include enterprise_label_shortform.md %} + With Docker UCP, you can add labels to your nodes. Labels are metadata that describe the node, like its role (development, QA, production), its region (US, EU, APAC), or the kind of disk (hdd, ssd). Once you have labeled your diff --git a/ee/ucp/admin/configure/add-sans-to-cluster.md b/ee/ucp/admin/configure/add-sans-to-cluster.md index 00726d3166..dd366865c2 100644 --- a/ee/ucp/admin/configure/add-sans-to-cluster.md +++ b/ee/ucp/admin/configure/add-sans-to-cluster.md @@ -4,6 +4,8 @@ description: Learn how to add new SANs to cluster nodes, allowing you to connect keywords: cluster, node, label, certificate, SAN --- +>{% include enterprise_label_shortform.md %} + UCP always runs with HTTPS enabled. When you connect to UCP, you need to make sure that the hostname that you use to connect is recognized by UCP's certificates. If, for instance, you put UCP behind a load balancer that diff --git a/ee/ucp/admin/configure/admission-controllers.md b/ee/ucp/admin/configure/admission-controllers.md index 3d4ab0a076..f73df8d352 100644 --- a/ee/ucp/admin/configure/admission-controllers.md +++ b/ee/ucp/admin/configure/admission-controllers.md @@ -5,6 +5,8 @@ keywords: cluster, psp, security --- +>{% include enterprise_label_shortform.md %} + This is the current list of admission controllers used by Docker: ### Default diff --git a/ee/ucp/admin/configure/collect-cluster-metrics.md b/ee/ucp/admin/configure/collect-cluster-metrics.md index 80ff88f514..a480ce7e3d 100644 --- a/ee/ucp/admin/configure/collect-cluster-metrics.md +++ b/ee/ucp/admin/configure/collect-cluster-metrics.md @@ -6,6 +6,8 @@ redirect_from: - /engine/admin/prometheus/ --- +>{% include enterprise_label_shortform.md %} + [Prometheus](https://prometheus.io/) is an open-source systems monitoring and alerting toolkit. You can configure Docker as a Prometheus target. This topic shows you how to configure Docker, set up Prometheus to run as a Docker diff --git a/ee/ucp/admin/configure/configure-rbac-kube.md b/ee/ucp/admin/configure/configure-rbac-kube.md index 520be5864c..f963e6fdd5 100644 --- a/ee/ucp/admin/configure/configure-rbac-kube.md +++ b/ee/ucp/admin/configure/configure-rbac-kube.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/authorization/migrate-kubernetes-roles/ --- +>{% include enterprise_label_shortform.md %} + UCP 3.0 used its own role-based access control (RBAC) for Kubernetes clusters. New in UCP 3.1 is the ability to use native Kubernetes RBAC. The benefits of doing this are: - Many ecosystem applications and integrations expect Kubernetes RBAC as a part of their YAML files to provide access to service accounts. diff --git a/ee/ucp/admin/configure/deploy-route-reflectors.md b/ee/ucp/admin/configure/deploy-route-reflectors.md index b2541bd38f..deb4d20691 100644 --- a/ee/ucp/admin/configure/deploy-route-reflectors.md +++ b/ee/ucp/admin/configure/deploy-route-reflectors.md @@ -5,6 +5,8 @@ description: Learn how to deploy Calico Route Reflectors to improve performance keywords: cluster, node, label, certificate, SAN --- +>{% include enterprise_label_shortform.md %} + UCP uses Calico as the default Kubernetes networking solution. Calico is configured to create a BGP mesh between all nodes in the cluster. diff --git a/ee/ucp/admin/configure/enable-audit-logging.md b/ee/ucp/admin/configure/enable-audit-logging.md index ffa50be4fa..b34e946f13 100644 --- a/ee/ucp/admin/configure/enable-audit-logging.md +++ b/ee/ucp/admin/configure/enable-audit-logging.md @@ -5,6 +5,8 @@ keywords: logs, ucp, swarm, kubernetes, audits redirect_from: /ee/ucp/admin/configure/create-audit-logs/ --- +>{% include enterprise_label_shortform.md %} + Audit logs are a chronological record of security-relevant activities by individual users, administrators or software components that have affected the system. They are focused on external user/agent actions and security rather than diff --git a/ee/ucp/admin/configure/enable-helm-tiller.md b/ee/ucp/admin/configure/enable-helm-tiller.md index e55fe617c4..78a2102fb2 100644 --- a/ee/ucp/admin/configure/enable-helm-tiller.md +++ b/ee/ucp/admin/configure/enable-helm-tiller.md @@ -4,6 +4,8 @@ description: Learn how to modify service accounts to enable Helm and Tiller to o keywords: Helm, ucp, Tiller, Kubernetes, service accounts, Kubernetes --- +>{% include enterprise_label_shortform.md %} + To use [Helm and Tiller](https://helm.sh/) with UCP, you must modify the `kube-system` default service account to define the necessary roles. Enter the following `kubectl` commands in this order: ``` diff --git a/ee/ucp/admin/configure/enable-saml-authentication.md b/ee/ucp/admin/configure/enable-saml-authentication.md index 314fd5acbc..548908a371 100644 --- a/ee/ucp/admin/configure/enable-saml-authentication.md +++ b/ee/ucp/admin/configure/enable-saml-authentication.md @@ -4,6 +4,8 @@ description: Learn how to configure user authentication with SAML 2.0 keywords: SAML, ucp, authentication, SSO, Okta, ADFS --- +>{% include enterprise_label_shortform.md %} + SAML is commonly supported by enterprise authentication systems. SAML-based single sign-on (SSO) gives you access to UCP through a SAML 2.0-compliant identity provider. SAML-based single sign-on (SSO) gives you access to UCP through a SAML 2.0-compliant identity provider. UCP supports SAML for authentication as a service provider integrated with your identity provider. diff --git a/ee/ucp/admin/configure/external-auth/index.md b/ee/ucp/admin/configure/external-auth/index.md index 6789f50f3e..b90347a04b 100644 --- a/ee/ucp/admin/configure/external-auth/index.md +++ b/ee/ucp/admin/configure/external-auth/index.md @@ -5,6 +5,8 @@ description: Learn how to integrate UCP with an LDAP service, so that you can keywords: LDAP, UCP, authentication, user management --- +>{% include enterprise_label_shortform.md %} + Docker UCP integrates with LDAP directory services, so that you can manage users and groups from your organization's directory and it will automatically propagate that information to UCP and DTR. diff --git a/ee/ucp/admin/configure/integrate-saml.md b/ee/ucp/admin/configure/integrate-saml.md index d949bc4347..274a8ce1b8 100644 --- a/ee/ucp/admin/configure/integrate-saml.md +++ b/ee/ucp/admin/configure/integrate-saml.md @@ -4,6 +4,8 @@ description: Learn how to use SAML to link a UCP team with an Identity Provider keywords: cluster, node, join --- +>{% include enterprise_label_shortform.md %} + ## SAML integration Security Assertion Markup Language (SAML) is an open standard for exchanging authentication and authorization data between parties. The SAML integration process is described below. diff --git a/ee/ucp/admin/configure/integrate-scim.md b/ee/ucp/admin/configure/integrate-scim.md index b54eba18b6..e401c8fe8c 100644 --- a/ee/ucp/admin/configure/integrate-scim.md +++ b/ee/ucp/admin/configure/integrate-scim.md @@ -4,6 +4,8 @@ description: Learn how to configure SCIM with UCP. keywords: authentication, authorization, SSO, SAML, SCIM, management --- +>{% include enterprise_label_shortform.md %} + # SCIM integration Simple-Cloud-Identity-Management/System-for-Cross-domain-Identity-Management (SCIM) provides an LDAP alternative for provisioning and managing users and groups, as well as syncing users and groups with an upstream identity provider. Using SCIM schema and API, you can utilize Single Sign-on services (SSO) across various tools. diff --git a/ee/ucp/admin/configure/join-nodes/index.md b/ee/ucp/admin/configure/join-nodes/index.md index 2379a20928..de93824c49 100644 --- a/ee/ucp/admin/configure/join-nodes/index.md +++ b/ee/ucp/admin/configure/join-nodes/index.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/admin/configure/set-up-high-availability/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane is designed for high availability (HA). You can join multiple manager nodes to the cluster, so that if one manager node fails, another can automatically take its place without impact to the cluster. diff --git a/ee/ucp/admin/configure/join-nodes/join-linux-nodes-to-cluster.md b/ee/ucp/admin/configure/join-nodes/join-linux-nodes-to-cluster.md index fe5f356c1d..7526cb0944 100644 --- a/ee/ucp/admin/configure/join-nodes/join-linux-nodes-to-cluster.md +++ b/ee/ucp/admin/configure/join-nodes/join-linux-nodes-to-cluster.md @@ -4,6 +4,8 @@ description: Learn how to scale a Docker Enterprise Edition cluster by adding ma keywords: Docker Enterprise, UCP, cluster, scale, worker, manager --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise is designed for scaling horizontally as your applications grow in size and usage. You can add or remove nodes from the cluster to scale it to your needs. You can join Windows Server and Linux nodes diff --git a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md index 34bcee247c..e2aa7022e0 100644 --- a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md +++ b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md @@ -6,6 +6,8 @@ redirect_from: - /datacenter/ucp/3.0/guides/admin/configure/join-nodes/join-windows-nodes-to-cluster/ --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise 3.0 supports worker nodes that run on Windows Server 2016 and Windows Server 2019. Only worker nodes are supported on Windows, and all manager nodes in the cluster must run on Linux. Additionally Windows worker diff --git a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md index 47657bc876..539fdfeae6 100644 --- a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md +++ b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md @@ -4,6 +4,8 @@ description: Learn how to set up a load balancer to access the UCP web UI using keywords: UCP, high-availability, load balancer --- +>{% include enterprise_label_shortform.md %} + Once you've joined multiple manager nodes for high-availability, you can configure your own load balancer to balance user requests across all manager nodes. diff --git a/ee/ucp/admin/configure/license-your-installation.md b/ee/ucp/admin/configure/license-your-installation.md index a884cced25..2d3cff41fc 100644 --- a/ee/ucp/admin/configure/license-your-installation.md +++ b/ee/ucp/admin/configure/license-your-installation.md @@ -4,6 +4,8 @@ description: Learn how to license your Docker Universal Control Plane installati keywords: Universal Control Plane, UCP, install, license --- +>{% include enterprise_label_shortform.md %} + After installing Docker Universal Control Plane, you need to license your installation. Here's how to do it. diff --git a/ee/ucp/admin/configure/manage-and-deploy-private-images.md b/ee/ucp/admin/configure/manage-and-deploy-private-images.md index 298207ad31..ebc3244ff1 100644 --- a/ee/ucp/admin/configure/manage-and-deploy-private-images.md +++ b/ee/ucp/admin/configure/manage-and-deploy-private-images.md @@ -4,6 +4,8 @@ description: Learn how to push an image to Docker Trusted Registry and deploy it keywords: Docker EE, DTR, UCP, image, Kubernetes, orchestration, cluster --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise Edition (EE) has its own image registry (DTR) so that you can store and manage the images that you deploy to your cluster. In this topic, you push an image to DTR and later deploy it to your cluster, diff --git a/ee/ucp/admin/configure/metrics-descriptions.md b/ee/ucp/admin/configure/metrics-descriptions.md index 71799ef204..740795dcc0 100644 --- a/ee/ucp/admin/configure/metrics-descriptions.md +++ b/ee/ucp/admin/configure/metrics-descriptions.md @@ -6,6 +6,8 @@ redirect_from: - /engine/admin/prometheus/ --- +>{% include enterprise_label_shortform.md %} + # UCP metrics The following table lists the metrics that UCP exposes in Prometheus, along with descriptions. Note that only the metrics diff --git a/ee/ucp/admin/configure/restrict-services-to-worker-nodes.md b/ee/ucp/admin/configure/restrict-services-to-worker-nodes.md index 358cdcdfe1..2e9bd63d58 100644 --- a/ee/ucp/admin/configure/restrict-services-to-worker-nodes.md +++ b/ee/ucp/admin/configure/restrict-services-to-worker-nodes.md @@ -4,6 +4,8 @@ description: Learn how to configure Universal Control Plane to only allow runnin keywords: ucp, configuration, worker --- +>{% include enterprise_label_shortform.md %} + You can configure UCP to allow users to deploy and run services only in worker nodes. This ensures all cluster management functionality stays performant, and makes the cluster more secure. diff --git a/ee/ucp/admin/configure/run-only-the-images-you-trust.md b/ee/ucp/admin/configure/run-only-the-images-you-trust.md index 90ffe953fa..87222fbaa5 100644 --- a/ee/ucp/admin/configure/run-only-the-images-you-trust.md +++ b/ee/ucp/admin/configure/run-only-the-images-you-trust.md @@ -4,6 +4,8 @@ description: Configure a Docker UCP cluster to only allow running applications t keywords: ucp, dtr, security, trust --- +>{% include enterprise_label_shortform.md %} + With Docker Universal Control Plane you can enforce applications to only use Docker images signed by UCP users you trust. When a user tries to deploy an application to the cluster, UCP checks if the application uses a Docker image diff --git a/ee/ucp/admin/configure/scale-your-cluster.md b/ee/ucp/admin/configure/scale-your-cluster.md index 3deea6f890..6664720ae3 100644 --- a/ee/ucp/admin/configure/scale-your-cluster.md +++ b/ee/ucp/admin/configure/scale-your-cluster.md @@ -4,7 +4,9 @@ description: Learn how to scale Docker Universal Control Plane cluster, by addin keywords: UCP, cluster, scale --- -Docker UCP is designed for scaling horizontally as your applications grow in +>{% include enterprise_label_shortform.md %} + +/Docker UCP is designed for scaling horizontally as your applications grow in size and usage. You can add or remove nodes from the UCP cluster to make it scale to your needs. diff --git a/ee/ucp/admin/configure/set-orchestrator-type.md b/ee/ucp/admin/configure/set-orchestrator-type.md index 32eed9e672..ef03b622e2 100644 --- a/ee/ucp/admin/configure/set-orchestrator-type.md +++ b/ee/ucp/admin/configure/set-orchestrator-type.md @@ -4,6 +4,8 @@ description: Learn how to specify the orchestrator for nodes in a Docker Enterpr keywords: Docker Enterprise, UCP, cluster, orchestrator --- +>{% include enterprise_label_shortform.md %} + When you add a node to the cluster, the node's workloads are managed by a default orchestrator, either Docker Swarm or Kubernetes. When you install Docker Enterprise, new nodes are managed by Docker Swarm, but you can change the diff --git a/ee/ucp/admin/configure/set-session-timeout.md b/ee/ucp/admin/configure/set-session-timeout.md index c4bdf6d113..2629785864 100644 --- a/ee/ucp/admin/configure/set-session-timeout.md +++ b/ee/ucp/admin/configure/set-session-timeout.md @@ -4,6 +4,8 @@ description: Learn how to set the session timeout for users and other session pr keywords: UCP, authorization, authentication, security, session, timeout --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane enables setting properties of user sessions, like session timeout and number of concurrent sessions. diff --git a/ee/ucp/admin/configure/ucp-configuration-file.md b/ee/ucp/admin/configure/ucp-configuration-file.md index 07cf404694..70a5b3c6ed 100644 --- a/ee/ucp/admin/configure/ucp-configuration-file.md +++ b/ee/ucp/admin/configure/ucp-configuration-file.md @@ -4,6 +4,8 @@ description: Set up UCP deployments by using a configuration file. keywords: Docker EE, UCP, configuration, config --- +>{% include enterprise_label_shortform.md %} + There are two ways to configure UCP: - through the web interface, or - by importing and exporting the UCP config in a TOML file. For more information about TOML, see the [TOML README on GitHub](https://github.com/toml-lang/toml/blob/master/README.md). diff --git a/ee/ucp/admin/configure/use-node-local-network-in-swarm.md b/ee/ucp/admin/configure/use-node-local-network-in-swarm.md index c9555f215c..12e3261c4d 100644 --- a/ee/ucp/admin/configure/use-node-local-network-in-swarm.md +++ b/ee/ucp/admin/configure/use-node-local-network-in-swarm.md @@ -4,6 +4,8 @@ description: Learn how to use a local node network, like MAC VLAN, in a UCP clus keywords: ucp, network, macvlan --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane can use your local networking drivers to orchestrate your cluster. You can create a *config* network, with a driver like MAC VLAN, and you use it like any other named network in UCP. If it's set up diff --git a/ee/ucp/admin/configure/use-your-own-tls-certificates.md b/ee/ucp/admin/configure/use-your-own-tls-certificates.md index 13e32cd636..a5bd0fd5a0 100644 --- a/ee/ucp/admin/configure/use-your-own-tls-certificates.md +++ b/ee/ucp/admin/configure/use-your-own-tls-certificates.md @@ -4,6 +4,8 @@ description: Learn how to configure Docker Universal Control Plane to use your o keywords: Universal Control Plane, UCP, certificate, authentication, tls --- +>{% include enterprise_label_shortform.md %} + All UCP services are exposed using HTTPS, to ensure all communications between clients and UCP are encrypted. By default, this is done using self-signed TLS certificates that are not trusted by client tools like web browsers. So when diff --git a/ee/ucp/admin/configure/view-namespace-resources.md b/ee/ucp/admin/configure/view-namespace-resources.md index bdf8e69657..e705000b20 100644 --- a/ee/ucp/admin/configure/view-namespace-resources.md +++ b/ee/ucp/admin/configure/view-namespace-resources.md @@ -4,6 +4,8 @@ description: Learn how to set the Kubernetes namespace context in a Docker Enter keywords: Docker EE, UCP, Kubernetes, namespace --- +>{% include enterprise_label_shortform.md %} + With Docker Enterprise Edition, administrators can filter the view of Kubernetes objects by the namespace the objects are assigned to. You can specify a single namespace, or you can specify all available namespaces. diff --git a/ee/ucp/admin/install/architecture-specific-images.md b/ee/ucp/admin/install/architecture-specific-images.md index eba0d1c5c3..b23f30597a 100644 --- a/ee/ucp/admin/install/architecture-specific-images.md +++ b/ee/ucp/admin/install/architecture-specific-images.md @@ -4,6 +4,8 @@ description: Learn how to deploy Docker Universal Control Plane using images tha keywords: UCP, Docker EE, image, Windows --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane deploys images for a number of different hardware architectures. Some architectures require pulling images with specific tags or names indicating the target diff --git a/ee/ucp/admin/install/cloudproviders/install-on-aws.md b/ee/ucp/admin/install/cloudproviders/install-on-aws.md index 932800c4ea..00d92ab5ad 100644 --- a/ee/ucp/admin/install/cloudproviders/install-on-aws.md +++ b/ee/ucp/admin/install/cloudproviders/install-on-aws.md @@ -4,6 +4,8 @@ description: Learn how to install Docker Universal Control Plane in an Amazon We keywords: Universal Control Plane, UCP, install, Docker EE, AWS, Kubernetes --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane (UCP) can be installed on top of AWS without any customisation following the UCP [install documentation](./install/). Therefore this document is **optional**, however if you are deploying Kubernetes diff --git a/ee/ucp/admin/install/cloudproviders/install-on-azure-custom.md b/ee/ucp/admin/install/cloudproviders/install-on-azure-custom.md index 0db7aef3a5..00924ab8b6 100644 --- a/ee/ucp/admin/install/cloudproviders/install-on-azure-custom.md +++ b/ee/ucp/admin/install/cloudproviders/install-on-azure-custom.md @@ -4,6 +4,8 @@ description: Learn how to create custom RBAC roles to run Docker Enterprise on A keywords: Universal Control Plane, UCP, install, Docker Enterprise, Azure, Swarm --- +>{% include enterprise_label_shortform.md %} + ## Overview This document describes how to create Azure custom roles to deploy Docker Enterprise resources. diff --git a/ee/ucp/admin/install/cloudproviders/install-on-azure.md b/ee/ucp/admin/install/cloudproviders/install-on-azure.md index 1b3cdca1c7..14f917bc86 100644 --- a/ee/ucp/admin/install/cloudproviders/install-on-azure.md +++ b/ee/ucp/admin/install/cloudproviders/install-on-azure.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/admin/install/install-on-azure/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane (UCP) closely integrates with Microsoft Azure for its Kubernetes Networking and Persistent Storage feature set. UCP deploys the Calico CNI provider. In Azure, the Calico CNI leverages the Azure networking infrastructure for data path diff --git a/ee/ucp/admin/install/index.md b/ee/ucp/admin/install/index.md index 7650ede3a3..73e3b573ed 100644 --- a/ee/ucp/admin/install/index.md +++ b/ee/ucp/admin/install/index.md @@ -4,6 +4,8 @@ description: Learn how to install Docker Universal Control Plane on production. keywords: Universal Control Plane, UCP, install, Docker Enterprise --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane (UCP) is a containerized application that you can install on-premise or on a cloud infrastructure. diff --git a/ee/ucp/admin/install/install-offline.md b/ee/ucp/admin/install/install-offline.md index a8975f3904..8e6a8b6a37 100644 --- a/ee/ucp/admin/install/install-offline.md +++ b/ee/ucp/admin/install/install-offline.md @@ -5,6 +5,8 @@ description: Learn how to install Docker Universal Control Plane. on a machine w keywords: UCP, install, offline, Docker EE --- +>{% include enterprise_label_shortform.md %} + The procedure to install Docker Universal Control Plane on a host is the same, whether the host has access to the internet or not. diff --git a/ee/ucp/admin/install/plan-installation.md b/ee/ucp/admin/install/plan-installation.md index 1122f4577f..0bf82a06fc 100644 --- a/ee/ucp/admin/install/plan-installation.md +++ b/ee/ucp/admin/install/plan-installation.md @@ -4,6 +4,8 @@ description: Learn about the Docker Universal Control Plane architecture, and th keywords: UCP, install, Docker EE --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane helps you manage your container cluster from a centralized place. This article explains what you need to consider before deploying Docker Universal Control Plane for production. diff --git a/ee/ucp/admin/install/system-requirements.md b/ee/ucp/admin/install/system-requirements.md index 226b8491e1..debe67e57c 100644 --- a/ee/ucp/admin/install/system-requirements.md +++ b/ee/ucp/admin/install/system-requirements.md @@ -6,6 +6,8 @@ redirect_from: - /enterprise/admin/install/system-requirements/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane can be installed on-premises or on the cloud. Before installing, be sure your infrastructure has these requirements. diff --git a/ee/ucp/admin/install/uninstall.md b/ee/ucp/admin/install/uninstall.md index 8a50f6907e..07ae54502e 100644 --- a/ee/ucp/admin/install/uninstall.md +++ b/ee/ucp/admin/install/uninstall.md @@ -4,6 +4,8 @@ description: Learn how to uninstall a Docker Universal Control Plane swarm. keywords: UCP, uninstall, install, Docker EE --- +>{% include enterprise_label_shortform.md %} + Docker UCP is designed to scale as your applications grow in size and usage. You can [add and remove nodes](../configure/scale-your-cluster.md) from the cluster to make it scale to your needs. diff --git a/ee/ucp/admin/install/upgrade-offline.md b/ee/ucp/admin/install/upgrade-offline.md index 7bf5953a1e..e9dfc151da 100644 --- a/ee/ucp/admin/install/upgrade-offline.md +++ b/ee/ucp/admin/install/upgrade-offline.md @@ -4,6 +4,8 @@ description: Learn how to upgrade Docker Universal Control Plane on a machine wi keywords: ucp, upgrade, offline --- +>{% include enterprise_label_shortform.md %} + Upgrading Universal Control Plane is the same, whether your hosts have access to the internet or not. diff --git a/ee/ucp/admin/install/upgrade.md b/ee/ucp/admin/install/upgrade.md index 72b0a1cfdc..7e958255d9 100644 --- a/ee/ucp/admin/install/upgrade.md +++ b/ee/ucp/admin/install/upgrade.md @@ -4,6 +4,8 @@ description: Learn how to upgrade Docker Universal Control Plane with minimal im keywords: UCP, upgrade, update --- +>{% include enterprise_label_shortform.md %} + This page helps you upgrade Docker Universal Control Plane (UCP) to version {{ page.ucp_version }}. diff --git a/ee/ucp/admin/monitor-and-troubleshoot/index.md b/ee/ucp/admin/monitor-and-troubleshoot/index.md index 915d9fd259..5d5ae81243 100644 --- a/ee/ucp/admin/monitor-and-troubleshoot/index.md +++ b/ee/ucp/admin/monitor-and-troubleshoot/index.md @@ -7,6 +7,8 @@ redirect_from: - /ucp/monitor/monitor-ucp/ --- +>{% include enterprise_label_shortform.md %} + You can monitor the status of UCP by using the web UI or the CLI. You can also use the `_ping` endpoint to build monitoring automation. diff --git a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations.md b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations.md index a388121278..3bc2dd9381 100644 --- a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations.md +++ b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations.md @@ -4,6 +4,8 @@ description: Learn how to troubleshoot your Docker Universal Control Plane clust keywords: troubleshoot, etcd, rethinkdb, key, value, store, database, ucp, health, cluster --- +>{% include enterprise_label_shortform.md %} + UCP automatically tries to heal itself by monitoring its internal components and trying to bring them to a healthy state. diff --git a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-node-messages.md b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-node-messages.md index b9f3c71ea3..0a0a61707a 100644 --- a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-node-messages.md +++ b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-node-messages.md @@ -8,6 +8,8 @@ redirect_from: - /ucp/monitor/troubleshoot-configurations/ --- +>{% include enterprise_label_shortform.md %} + There are several cases in the lifecycle of UCP when a node is actively transitioning from one state to another, such as when a new node is joining the cluster or during node promotion and demotion. In these cases, the current step diff --git a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md index 5dc9fe8cd5..9e395535b9 100644 --- a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md +++ b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md @@ -4,6 +4,8 @@ description: Learn how to troubleshoot your Docker Universal Control Plane clust keywords: ucp, troubleshoot, health, cluster --- +>{% include enterprise_label_shortform.md %} + If you detect problems in your UCP cluster, you can start your troubleshooting session by checking the logs of the [individual UCP components](../../ucp-architecture.md). Only administrator users can diff --git a/ee/ucp/authorization/create-teams-with-ldap.md b/ee/ucp/authorization/create-teams-with-ldap.md index 42ff78e60c..075d2babdc 100644 --- a/ee/ucp/authorization/create-teams-with-ldap.md +++ b/ee/ucp/authorization/create-teams-with-ldap.md @@ -4,6 +4,8 @@ description: Learn how to enable LDAP and sync users and teams in Docker Univers keywords: authorize, authentication, users, teams, UCP, LDAP --- +>{% include enterprise_label_shortform.md %} + To enable LDAP in UCP and sync to your LDAP directory: 1. Click **Admin Settings** under your username drop down. diff --git a/ee/ucp/authorization/create-users-and-teams-manually.md b/ee/ucp/authorization/create-users-and-teams-manually.md index 79e7a0bb24..4435593eab 100644 --- a/ee/ucp/authorization/create-users-and-teams-manually.md +++ b/ee/ucp/authorization/create-users-and-teams-manually.md @@ -6,6 +6,8 @@ redirect_from: - /datacenter/ucp/3.0/guides/authorization/create-users-and-teams-manually/ --- +>{% include enterprise_label_shortform.md %} + Users, teams, and organizations are referred to as subjects in Docker EE. Individual users can belong to one or more teams but each team can only be in diff --git a/ee/ucp/authorization/define-roles.md b/ee/ucp/authorization/define-roles.md index a3f40477ab..2e3195daa8 100644 --- a/ee/ucp/authorization/define-roles.md +++ b/ee/ucp/authorization/define-roles.md @@ -4,6 +4,8 @@ description: Learn how to create roles and set permissions in Docker Universal C keywords: rbac, authorization, authentication, users, teams, UCP, swarm --- +>{% include enterprise_label_shortform.md %} + A role defines a set of API operations permitted against a resource set. You apply roles to users and teams by creating grants. diff --git a/ee/ucp/authorization/deploy-stateless-app.md b/ee/ucp/authorization/deploy-stateless-app.md index c6ae5d8367..79dd37a452 100644 --- a/ee/ucp/authorization/deploy-stateless-app.md +++ b/ee/ucp/authorization/deploy-stateless-app.md @@ -4,6 +4,8 @@ description: Learn how to deploy a simple application and customize access to re keywords: rbac, authorize, authentication, user, team, UCP, Kubernetes --- +>{% include enterprise_label_shortform.md %} + This tutorial explains how to deploy a NGINX web server and limit access to one team with role-based access control (RBAC). diff --git a/ee/ucp/authorization/ee-advanced.md b/ee/ucp/authorization/ee-advanced.md index 325732441e..1e9da462cd 100644 --- a/ee/ucp/authorization/ee-advanced.md +++ b/ee/ucp/authorization/ee-advanced.md @@ -4,6 +4,8 @@ description: Learn how to architect multi-tenancy with Docker Enterprise. keywords: authorize, authentication, users, teams, groups, sync, UCP, role, access control --- +>{% include enterprise_label_shortform.md %} + Go through the [Docker Enterprise tutorial](ee-standard.md), before completing the following tutorial. diff --git a/ee/ucp/authorization/ee-standard.md b/ee/ucp/authorization/ee-standard.md index aef30209dd..c863247efa 100644 --- a/ee/ucp/authorization/ee-standard.md +++ b/ee/ucp/authorization/ee-standard.md @@ -4,6 +4,8 @@ description: Learn how to architect multi-tenancy by using Docker Enterprise. keywords: authorize, authentication, users, teams, groups, sync, UCP, role, access control --- +>{% include enterprise_label_shortform.md %} + [Collections and grants](index.md) are strong tools that can be used to control access and visibility to resources in UCP. diff --git a/ee/ucp/authorization/grant-permissions.md b/ee/ucp/authorization/grant-permissions.md index 0c6eff7fda..51a4cdb99f 100644 --- a/ee/ucp/authorization/grant-permissions.md +++ b/ee/ucp/authorization/grant-permissions.md @@ -6,6 +6,8 @@ redirect_from: - /datacenter/ucp/3.0/guides/authorization/grant-permissions/ --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise administrators can create _grants_ to control how users and organizations access [resource sets](group-resources.md). diff --git a/ee/ucp/authorization/group-resources.md b/ee/ucp/authorization/group-resources.md index 8f6757f616..e3aa9ee672 100644 --- a/ee/ucp/authorization/group-resources.md +++ b/ee/ucp/authorization/group-resources.md @@ -6,6 +6,8 @@ redirect_from: - /datacenter/ucp/3.0/guides/authorization/group-resources/ --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise enables access control to cluster resources by grouping resources into **resource sets**. Combine resource sets with [grants](grant-permissions) to give users permission to access specific cluster resources. diff --git a/ee/ucp/authorization/index.md b/ee/ucp/authorization/index.md index 29b2a9ce4a..4b48dfc2ec 100644 --- a/ee/ucp/authorization/index.md +++ b/ee/ucp/authorization/index.md @@ -4,6 +4,8 @@ description: Manage access to resources with role-based access control. keywords: ucp, grant, role, permission, authentication, authorization, resource, namespace, Kubernetes --- +>{% include enterprise_label_shortform.md %} + [Docker Universal Control Plane (UCP)](../index.md), the UI for [Docker Enterprise](https://www.docker.com/enterprise-edition), lets you authorize users to view, edit, and use cluster resources by granting role-based diff --git a/ee/ucp/authorization/isolate-nodes.md b/ee/ucp/authorization/isolate-nodes.md index 7b36b01566..c9e013fa71 100644 --- a/ee/ucp/authorization/isolate-nodes.md +++ b/ee/ucp/authorization/isolate-nodes.md @@ -4,6 +4,8 @@ description: Create grants that limit access to nodes to specific teams. keywords: ucp, grant, role, permission, authentication, node, Kubernetes --- +>{% include enterprise_label_shortform.md %} + With Docker Enterprise, you can enable physical isolation of resources by organizing nodes into collections and granting `Scheduler` access for different users. To control access to nodes, move them to dedicated collections diff --git a/ee/ucp/authorization/isolate-volumes.md b/ee/ucp/authorization/isolate-volumes.md index 10223e89c7..791b9b2f58 100644 --- a/ee/ucp/authorization/isolate-volumes.md +++ b/ee/ucp/authorization/isolate-volumes.md @@ -4,6 +4,8 @@ description: Create grants that limit access to volumes to specific teams. keywords: ucp, grant, role, permission, authentication --- +>{% include enterprise_label_shortform.md %} + In this example, two teams are granted access to volumes in two different resource collections. UCP access control prevents the teams from viewing and accessing each other's volumes, even though they may be located in the same diff --git a/ee/ucp/authorization/pull-images.md b/ee/ucp/authorization/pull-images.md index 2ce063a491..915d14b2e1 100644 --- a/ee/ucp/authorization/pull-images.md +++ b/ee/ucp/authorization/pull-images.md @@ -5,6 +5,8 @@ description: Learn how to grant permissions for users to pull images into a keywords: ucp, grant, images --- +>{% include enterprise_label_shortform.md %} + By default only admin users can pull images into a cluster managed by UCP. Images are a shared resource, as such they are always in the `swarm` collection. diff --git a/ee/ucp/authorization/reset-user-password.md b/ee/ucp/authorization/reset-user-password.md index 958e7245df..7cb5e28466 100644 --- a/ee/ucp/authorization/reset-user-password.md +++ b/ee/ucp/authorization/reset-user-password.md @@ -4,6 +4,8 @@ description: Learn how to recover your Docker Enterprise Edition credentials. keywords: ucp, authentication, password --- +>{% include enterprise_label_shortform.md %} + ## Change user passwords ### Managed in UCP diff --git a/ee/ucp/deploy-application-package.md b/ee/ucp/deploy-application-package.md index 240ae4a842..4ecbc6ef99 100644 --- a/ee/ucp/deploy-application-package.md +++ b/ee/ucp/deploy-application-package.md @@ -4,6 +4,8 @@ description: Learn how to deploy an application package in UCP keywords: ucp, swarm, kubernetes, application, app package --- +>{% include enterprise_label_shortform.md %} + ## Application packages Docker Enterprise Edition 2.1 introduces application packages in Docker. With application packages, you can add metadata and settings to an existing Compose file. This gives operators more context about applications they deploy and manage. diff --git a/ee/ucp/index.md b/ee/ucp/index.md index e8bc8a4625..cff620dd42 100644 --- a/ee/ucp/index.md +++ b/ee/ucp/index.md @@ -7,6 +7,8 @@ redirect_from: - /ucp/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane (UCP) is the enterprise-grade cluster management solution from Docker. You install it on-premises or in your virtual private cloud, and it helps you manage your Docker cluster and applications through a diff --git a/ee/ucp/interlock/architecture.md b/ee/ucp/interlock/architecture.md index ce2e1b2eef..90352b98e0 100644 --- a/ee/ucp/interlock/architecture.md +++ b/ee/ucp/interlock/architecture.md @@ -5,6 +5,8 @@ description: Learn more about the architecture of the layer 7 routing solution keywords: routing, UCP, interlock, load balancing --- +>{% include enterprise_label_shortform.md %} + This document covers the following considerations: - **Interlock default architecture** diff --git a/ee/ucp/interlock/config/host-mode-networking.md b/ee/ucp/interlock/config/host-mode-networking.md index 4ae24ea95a..afc7b16f70 100644 --- a/ee/ucp/interlock/config/host-mode-networking.md +++ b/ee/ucp/interlock/config/host-mode-networking.md @@ -8,6 +8,8 @@ redirect_from: - /ee/ucp/interlock/deploy/host-mode-networking/ --- +>{% include enterprise_label_shortform.md %} + By default, layer 7 routing components communicate with one another using overlay networks, but Interlock supports host mode networking in a variety of ways, including proxy only, Interlock only, application only, and hybrid. diff --git a/ee/ucp/interlock/config/index.md b/ee/ucp/interlock/config/index.md index d4417b1ee1..2b9a6c9b5c 100644 --- a/ee/ucp/interlock/config/index.md +++ b/ee/ucp/interlock/config/index.md @@ -7,6 +7,8 @@ redirect_from: - /ee/ucp/interlock/usage/default-service/ --- +>{% include enterprise_label_shortform.md %} + To further customize the layer 7 routing solution, you must update the `ucp-interlock` service with a new Docker configuration. diff --git a/ee/ucp/interlock/config/nginx-config.md b/ee/ucp/interlock/config/nginx-config.md index 580fd470e4..de53f09eaf 100644 --- a/ee/ucp/interlock/config/nginx-config.md +++ b/ee/ucp/interlock/config/nginx-config.md @@ -4,6 +4,8 @@ description: Learn how to configure an nginx extension keywords: routing, proxy, interlock, load balancing --- +>{% include enterprise_label_shortform.md %} + By default, nginx is used as a proxy, so the following configuration options are available for the nginx extension: diff --git a/ee/ucp/interlock/config/tuning.md b/ee/ucp/interlock/config/tuning.md index 3d82ff6102..dceaeb69c6 100644 --- a/ee/ucp/interlock/config/tuning.md +++ b/ee/ucp/interlock/config/tuning.md @@ -4,6 +4,8 @@ description: Learn how to tune the proxy service for environment optimization keywords: routing, proxy, interlock --- +>{% include enterprise_label_shortform.md %} + ## Constrain the proxy service to multiple dedicated worker nodes Refer to [Proxy service constraints](../deploy/production.md) for information on how to constrain the proxy service to multiple dedicated worker nodes. diff --git a/ee/ucp/interlock/config/updates.md b/ee/ucp/interlock/config/updates.md index f6cbfaf912..041e84c0c0 100644 --- a/ee/ucp/interlock/config/updates.md +++ b/ee/ucp/interlock/config/updates.md @@ -4,6 +4,8 @@ description: Learn how to update the UCP layer 7 routing solution services keywords: routing, proxy, interlock --- +>{% include enterprise_label_shortform.md %} + There are two parts to the update process: 1. Update the Interlock configuration to specify the new extension and/or proxy image versions. diff --git a/ee/ucp/interlock/deploy/index.md b/ee/ucp/interlock/deploy/index.md index 414309fa24..5ef40ae259 100644 --- a/ee/ucp/interlock/deploy/index.md +++ b/ee/ucp/interlock/deploy/index.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/interlock/deploy/configuration-reference/ --- +>{% include enterprise_label_shortform.md %} + This topic covers deploying a layer 7 routing solution into a Docker Swarm to route traffic to Swarm services. Layer 7 routing is also referred to as an HTTP routing mesh (HRM). ## Prerequisites diff --git a/ee/ucp/interlock/deploy/offline-install.md b/ee/ucp/interlock/deploy/offline-install.md index 77bcd067a4..a2acc72351 100644 --- a/ee/ucp/interlock/deploy/offline-install.md +++ b/ee/ucp/interlock/deploy/offline-install.md @@ -4,6 +4,8 @@ description: Learn how to to install Interlock on a Docker cluster without inter keywords: routing, proxy, interlock --- +>{% include enterprise_label_shortform.md %} + To install Interlock on a Docker cluster without internet access, the Docker images must be loaded. This topic describes how to export the images from a local Docker engine and then load them to the Docker Swarm cluster. diff --git a/ee/ucp/interlock/deploy/production.md b/ee/ucp/interlock/deploy/production.md index afc6fda752..386daf31b8 100644 --- a/ee/ucp/interlock/deploy/production.md +++ b/ee/ucp/interlock/deploy/production.md @@ -5,6 +5,8 @@ description: Learn how to configure the layer 7 routing solution for a productio keywords: routing, proxy, interlock --- +>{% include enterprise_label_shortform.md %} + This section includes documentation on configuring Interlock for a production environment. If you have not yet deployed Interlock, refer to [Deploying Interlock](./index.md) because this information builds upon the basic deployment. This topic does not cover infrastructure deployment - it assumes you have a vanilla Swarm cluster (`docker init` and `docker swarm join` from the nodes). diff --git a/ee/ucp/interlock/deploy/upgrade.md b/ee/ucp/interlock/deploy/upgrade.md index e695a0247e..52cf6bcbe9 100644 --- a/ee/ucp/interlock/deploy/upgrade.md +++ b/ee/ucp/interlock/deploy/upgrade.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/interlock/upgrade/ --- +>{% include enterprise_label_shortform.md %} + The [HTTP routing mesh](/datacenter/ucp/2.2/guides/admin/configure/use-domain-names-to-access-services.md) functionality was redesigned in UCP 3.0 for greater security and flexibility. The functionality was also renamed to "layer 7 routing", to make it easier for diff --git a/ee/ucp/interlock/index.md b/ee/ucp/interlock/index.md index 6aed55d0a5..250d6e6148 100644 --- a/ee/ucp/interlock/index.md +++ b/ee/ucp/interlock/index.md @@ -4,6 +4,8 @@ description: Learn how to route layer 7 traffic to your Swarm services keywords: routing, UCP, interlock, load balancing --- +>{% include enterprise_label_shortform.md %} + Application-layer (Layer 7) routing is the application routing and load balancing (ingress routing) system included with Docker Enterprise for Swarm orchestration. Interlock architecture takes advantage of the underlying Swarm components to provide scalable Layer 7 routing and Layer 4 VIP mode functionality. Interlock is specific to the Swarm orchestrator. If you're trying to route diff --git a/ee/ucp/interlock/usage/canary.md b/ee/ucp/interlock/usage/canary.md index 2041ec7f16..ec28748d82 100644 --- a/ee/ucp/interlock/usage/canary.md +++ b/ee/ucp/interlock/usage/canary.md @@ -4,6 +4,8 @@ description: Learn how to do canary deployments for your Docker swarm services keywords: routing, proxy --- +>{% include enterprise_label_shortform.md %} + The following example publishes a service as a canary instance. First, create an overlay network to isolate and secure service traffic: diff --git a/ee/ucp/interlock/usage/context.md b/ee/ucp/interlock/usage/context.md index 6390931108..ca75c521d9 100644 --- a/ee/ucp/interlock/usage/context.md +++ b/ee/ucp/interlock/usage/context.md @@ -5,6 +5,8 @@ description: Learn how to route traffic to your Docker swarm services based keywords: routing, proxy --- +>{% include enterprise_label_shortform.md %} + The following example publishes a service using context or path based routing. First, create an overlay network so that service traffic is isolated and secure: diff --git a/ee/ucp/interlock/usage/index.md b/ee/ucp/interlock/usage/index.md index 9d92f01a46..49abea2724 100644 --- a/ee/ucp/interlock/usage/index.md +++ b/ee/ucp/interlock/usage/index.md @@ -7,6 +7,8 @@ redirect_from: - /ee/ucp/interlock/deploy/configure/ --- +>{% include enterprise_label_shortform.md %} + After Interlock is deployed, you can launch and publish services and applications. Use [Service Labels](/engine/reference/commandline/service_create/#set-metadata-on-a-service--l-label) to configure services to publish themselves to the load balancer. diff --git a/ee/ucp/interlock/usage/interlock-vip-mode.md b/ee/ucp/interlock/usage/interlock-vip-mode.md index 5ccad77c12..08469c98c5 100644 --- a/ee/ucp/interlock/usage/interlock-vip-mode.md +++ b/ee/ucp/interlock/usage/interlock-vip-mode.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/interlock/usage/default-backend/ --- +>{% include enterprise_label_shortform.md %} + You can publish services using "vip" and "task" backend routing modes. ## Task routing mode diff --git a/ee/ucp/interlock/usage/labels-reference.md b/ee/ucp/interlock/usage/labels-reference.md index cfc0dfe12e..068b6ef4fb 100644 --- a/ee/ucp/interlock/usage/labels-reference.md +++ b/ee/ucp/interlock/usage/labels-reference.md @@ -7,6 +7,8 @@ redirect_from: keywords: routing, proxy, interlock, load balancing --- +>{% include enterprise_label_shortform.md %} + After you enable the layer 7 routing solution, you can [start using it in your swarm services](index.md). diff --git a/ee/ucp/interlock/usage/redirects.md b/ee/ucp/interlock/usage/redirects.md index 82e3e72764..18cb975297 100644 --- a/ee/ucp/interlock/usage/redirects.md +++ b/ee/ucp/interlock/usage/redirects.md @@ -5,6 +5,8 @@ description: Learn how to implement redirects using swarm services and the keywords: routing, proxy, redirects, interlock --- +>{% include enterprise_label_shortform.md %} + The following example publishes a service and configures a redirect from `old.local` to `new.local`. First, create an overlay network so that service traffic is isolated and secure: diff --git a/ee/ucp/interlock/usage/service-clusters.md b/ee/ucp/interlock/usage/service-clusters.md index 8570b49a62..c38cd6ad78 100644 --- a/ee/ucp/interlock/usage/service-clusters.md +++ b/ee/ucp/interlock/usage/service-clusters.md @@ -4,6 +4,8 @@ description: Learn how to route traffic to different proxies using a service clu keywords: ucp, interlock, load balancing, routing --- +>{% include enterprise_label_shortform.md %} + ## Configure Proxy Services With the node labels, you can re-configure the Interlock Proxy services to be constrained to the workers for each region. For example, from a manager, run the following commands to pin the proxy services to the ingress workers: diff --git a/ee/ucp/interlock/usage/sessions.md b/ee/ucp/interlock/usage/sessions.md index f0d2ac106b..eaba729044 100644 --- a/ee/ucp/interlock/usage/sessions.md +++ b/ee/ucp/interlock/usage/sessions.md @@ -5,6 +5,8 @@ description: Learn how to configure your swarm services with persistent sessions keywords: routing, proxy, cookies, IP hash --- +>{% include enterprise_label_shortform.md %} + You can publish a service and configure the proxy for persistent (sticky) sessions using: - Cookies diff --git a/ee/ucp/interlock/usage/ssl.md b/ee/ucp/interlock/usage/ssl.md index f7d81413ea..ae1d460220 100644 --- a/ee/ucp/interlock/usage/ssl.md +++ b/ee/ucp/interlock/usage/ssl.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/interlock/usage/ssl/ --- +>{% include enterprise_label_shortform.md %} + # Implementing SSL This topic covers implementing Swarm services with SLL: diff --git a/ee/ucp/interlock/usage/tls.md b/ee/ucp/interlock/usage/tls.md index 7714d5d124..a12377c08e 100644 --- a/ee/ucp/interlock/usage/tls.md +++ b/ee/ucp/interlock/usage/tls.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/interlock/usage/ssl/ --- +>{% include enterprise_label_shortform.md %} + After [deploying a layer 7 routing solution](../deploy/index.md), you have two options for securing your services with TLS: diff --git a/ee/ucp/interlock/usage/websockets.md b/ee/ucp/interlock/usage/websockets.md index 69eb9febb7..3fea4e2621 100644 --- a/ee/ucp/interlock/usage/websockets.md +++ b/ee/ucp/interlock/usage/websockets.md @@ -4,6 +4,8 @@ description: Learn how to use websockets in your swarm services. keywords: routing, proxy, websockets --- +>{% include enterprise_label_shortform.md %} + First, create an overlay network to isolate and secure service traffic: ```bash diff --git a/ee/ucp/kubernetes/cluster-ingress/canary.md b/ee/ucp/kubernetes/cluster-ingress/canary.md index c8e3a7a4db..38a38d4565 100644 --- a/ee/ucp/kubernetes/cluster-ingress/canary.md +++ b/ee/ucp/kubernetes/cluster-ingress/canary.md @@ -4,6 +4,8 @@ description: Stage a canary release using weight-based load balancing between mu keywords: ucp, cluster, ingress, kubernetes --- +>{% include enterprise_label_shortform.md %} + {% include experimental-feature.md %} ## Overview diff --git a/ee/ucp/kubernetes/cluster-ingress/index.md b/ee/ucp/kubernetes/cluster-ingress/index.md index 3af9d2acbe..7c8979c0ac 100644 --- a/ee/ucp/kubernetes/cluster-ingress/index.md +++ b/ee/ucp/kubernetes/cluster-ingress/index.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/kubernetes/layer-7-routing/ --- +>{% include enterprise_label_shortform.md %} + {% include experimental-feature.md %} ## Cluster Ingress capabilities diff --git a/ee/ucp/kubernetes/cluster-ingress/ingress.md b/ee/ucp/kubernetes/cluster-ingress/ingress.md index 777e79309d..0f270f1011 100644 --- a/ee/ucp/kubernetes/cluster-ingress/ingress.md +++ b/ee/ucp/kubernetes/cluster-ingress/ingress.md @@ -4,6 +4,8 @@ description: Learn how to deploy Ingress rules for Kubernetes applications. keywords: ucp, cluster, ingress, kubernetes --- +>{% include enterprise_label_shortform.md %} + {% include experimental-feature.md %} ## Overview diff --git a/ee/ucp/kubernetes/cluster-ingress/install.md b/ee/ucp/kubernetes/cluster-ingress/install.md index 55a20cfca2..75a7174bfe 100644 --- a/ee/ucp/kubernetes/cluster-ingress/install.md +++ b/ee/ucp/kubernetes/cluster-ingress/install.md @@ -4,6 +4,8 @@ description: Learn how to deploy ingress rules using Kubernetes manifests. keywords: ucp, cluster, ingress, kubernetes --- +>{% include enterprise_label_shortform.md %} + {% include experimental-feature.md %} ## Overview diff --git a/ee/ucp/kubernetes/cluster-ingress/sticky.md b/ee/ucp/kubernetes/cluster-ingress/sticky.md index 0bc7ff5af0..e32c37b788 100644 --- a/ee/ucp/kubernetes/cluster-ingress/sticky.md +++ b/ee/ucp/kubernetes/cluster-ingress/sticky.md @@ -4,6 +4,8 @@ description: Learn how to use cookies with Ingress host and path routing. keywords: ucp, cluster, ingress, kubernetes --- +>{% include enterprise_label_shortform.md %} + {% include experimental-feature.md %} ## Overview diff --git a/ee/ucp/kubernetes/create-service-account.md b/ee/ucp/kubernetes/create-service-account.md index ed71d89482..48c79a653d 100644 --- a/ee/ucp/kubernetes/create-service-account.md +++ b/ee/ucp/kubernetes/create-service-account.md @@ -4,6 +4,8 @@ description: Learn how to use a service account to give a Kubernetes workload ac keywords: UCP, Docker EE, Kubernetes, authorization, access control, grant --- +>{% include enterprise_label_shortform.md %} + Kubernetes enables access control for workloads by providing service accounts. A service account represents an identity for processes that run in a pod. When a process is authenticated through a service account, it can contact the diff --git a/ee/ucp/kubernetes/deploy-with-compose.md b/ee/ucp/kubernetes/deploy-with-compose.md index cefade7df4..41b020eb98 100644 --- a/ee/ucp/kubernetes/deploy-with-compose.md +++ b/ee/ucp/kubernetes/deploy-with-compose.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/services/deploy-compose-on-kubernetes/ --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise Edition enables deploying [Docker Compose](/compose/overview.md/) files to Kubernetes clusters. Starting in Compose file version 3.3, you use the same `docker-compose.yml` file that you use for Swarm deployments, but you diff --git a/ee/ucp/kubernetes/index.md b/ee/ucp/kubernetes/index.md index 05595ca259..92f91643a2 100644 --- a/ee/ucp/kubernetes/index.md +++ b/ee/ucp/kubernetes/index.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/services/deploy-kubernetes-workload/ --- +>{% include enterprise_label_shortform.md %} + The Docker EE web UI enables deploying your Kubernetes YAML files. In most cases, no modifications are necessary to deploy on a cluster that's managed by Docker EE. diff --git a/ee/ucp/kubernetes/install-cni-plugin.md b/ee/ucp/kubernetes/install-cni-plugin.md index 00fab12f97..dc919d0545 100644 --- a/ee/ucp/kubernetes/install-cni-plugin.md +++ b/ee/ucp/kubernetes/install-cni-plugin.md @@ -4,6 +4,8 @@ description: Learn how to install a Container Networking Interface (CNI) plugin keywords: ucp, kubernetes, cni, container networking interface, flannel, weave, calico --- +>{% include enterprise_label_shortform.md %} + For Docker Universal Control Plane (UCP), [Calico](https://docs.projectcalico.org/v3.7/introduction/) provides the secure networking functionality for container-to-container communication within Kubernetes. UCP handles the lifecycle of Calico and packages it with UCP diff --git a/ee/ucp/kubernetes/kube-resources.md b/ee/ucp/kubernetes/kube-resources.md index 6c79ca46cb..23980dca84 100644 --- a/ee/ucp/kubernetes/kube-resources.md +++ b/ee/ucp/kubernetes/kube-resources.md @@ -4,6 +4,8 @@ description: Learn where to access various Kubernetes resources in the UCP web i keywords: ucp, resources, Kubernetes --- +>{% include enterprise_label_shortform.md %} + The following diagram shows which Kubernetes resources are visible in the UCP web interface: ![](../images/kubemap.png){: .with-border} diff --git a/ee/ucp/kubernetes/kubernetes-network-encryption.md b/ee/ucp/kubernetes/kubernetes-network-encryption.md index 47bf60d1a8..32177d044c 100644 --- a/ee/ucp/kubernetes/kubernetes-network-encryption.md +++ b/ee/ucp/kubernetes/kubernetes-network-encryption.md @@ -4,6 +4,8 @@ description: Learn how to configure network encryption in Kubernetes keywords: ucp, cli, administration, kubectl, Kubernetes, security, network, ipsec, ipip, esp, calico --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise Edition provides data-plane level IPSec network encryption to securely encrypt application traffic in a Kubernetes cluster. This secures application traffic within a cluster when running in untrusted infrastructure or environments. It is an optional feature of UCP that is enabled by deploying the SecureOverlay diff --git a/ee/ucp/kubernetes/pod-security-policies.md b/ee/ucp/kubernetes/pod-security-policies.md index af23fd0829..10f8ac4caf 100644 --- a/ee/ucp/kubernetes/pod-security-policies.md +++ b/ee/ucp/kubernetes/pod-security-policies.md @@ -4,6 +4,8 @@ description: Learn how to use Pod Security Policies to lock down Kubernetes as p keywords: UCP, Kubernetes, psps, pod security policies --- +>{% include enterprise_label_shortform.md %} + Pod Security Policies (PSPs) are cluster-level resources which are enabled by default in Docker Universal Control Plane (UCP) 3.2. See [Pod Security Policy](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) for an diff --git a/ee/ucp/kubernetes/storage/configure-aws-storage.md b/ee/ucp/kubernetes/storage/configure-aws-storage.md index 9af8bc1daa..9713240814 100644 --- a/ee/ucp/kubernetes/storage/configure-aws-storage.md +++ b/ee/ucp/kubernetes/storage/configure-aws-storage.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/kubernetes/configure-aws-storage/ --- +>{% include enterprise_label_shortform.md %} + [AWS Elastic Block Store](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AmazonEBS.html) (EBS) can be deployed with Kubernetes in Docker Enterprise 2.1 to use AWS volumes as peristent storage for applications. Before using EBS volumes, configure UCP and the AWS infrastructure for storage orchestration to function. ## Configure AWS Infrastructure for Kubernetes diff --git a/ee/ucp/kubernetes/storage/use-azure-disk.md b/ee/ucp/kubernetes/storage/use-azure-disk.md index a2471925a9..7dfcb580a2 100644 --- a/ee/ucp/kubernetes/storage/use-azure-disk.md +++ b/ee/ucp/kubernetes/storage/use-azure-disk.md @@ -5,6 +5,8 @@ keywords: Universal Control Plane, UCP, Docker EE, Kubernetes, storage, volume redirect_from: --- +>{% include enterprise_label_shortform.md %} + Platform operators can provide persistent storage for workloads running on Docker Enterprise and Microsoft Azure by using Azure Disk. Platform operators can either pre-provision Azure Disks to be consumed by Kubernetes diff --git a/ee/ucp/kubernetes/storage/use-azure-files.md b/ee/ucp/kubernetes/storage/use-azure-files.md index 6ba7ead84d..e7830efe59 100644 --- a/ee/ucp/kubernetes/storage/use-azure-files.md +++ b/ee/ucp/kubernetes/storage/use-azure-files.md @@ -5,6 +5,8 @@ keywords: Universal Control Plane, UCP, Docker EE, Kubernetes, storage, volume redirect_from: --- +>{% include enterprise_label_shortform.md %} + Platform operators can provide persistent storage for workloads running on Docker Enterprise and Microsoft Azure by using Azure Files. You can either pre-provision Azure Files Shares to be consumed by diff --git a/ee/ucp/kubernetes/storage/use-csi.md b/ee/ucp/kubernetes/storage/use-csi.md index f5156d7edd..e19905fa4d 100644 --- a/ee/ucp/kubernetes/storage/use-csi.md +++ b/ee/ucp/kubernetes/storage/use-csi.md @@ -4,6 +4,8 @@ description: Learn how to deploy a CSI driver with UCP. keywords: Universal Control Plane, UCP, Docker EE, Kubernetes, storage, volume --- +>{% include enterprise_label_shortform.md %} + The Container Storage Interface (CSI) is a specification for container orchestrators to manage block and file-based volumes for storing data. Storage vendors can each create a single CSI driver that works with multiple container orchestrators. The Kubernetes community maintains sidecar containers that can be used by a containerized diff --git a/ee/ucp/kubernetes/storage/use-iscsi.md b/ee/ucp/kubernetes/storage/use-iscsi.md index 03d6a061c2..0fdd729ef7 100644 --- a/ee/ucp/kubernetes/storage/use-iscsi.md +++ b/ee/ucp/kubernetes/storage/use-iscsi.md @@ -4,6 +4,8 @@ description: Learn how to configure iSCSI. keywords: Universal Control Plane, UCP, Docker EE, Kubernetes, storage, volume --- +>{% include enterprise_label_shortform.md %} + Internet Small Computer System Interface (iSCSI) is an IP-based standard that provides block-level access to storage devices. iSCSI takes requests from clients and fulfills these requests on remote SCSI devices. iSCSI support in UCP enables Kubernetes workloads to consume persistent storage from iSCSI targets. diff --git a/ee/ucp/kubernetes/storage/use-nfs-volumes.md b/ee/ucp/kubernetes/storage/use-nfs-volumes.md index f2561a1ca7..fbffb1485a 100644 --- a/ee/ucp/kubernetes/storage/use-nfs-volumes.md +++ b/ee/ucp/kubernetes/storage/use-nfs-volumes.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/admin/configure/use-nfs-volumes/ --- +>{% include enterprise_label_shortform.md %} + Users can provide persistent storage for workloads running on Docker Enterprise by using NFS storage. These NFS shares, when mounted into the running container, provide state to the application, managing data external to the container's diff --git a/ee/ucp/kubernetes/storage/use-vsphere-volumes.md b/ee/ucp/kubernetes/storage/use-vsphere-volumes.md index e80d147c9c..d2ca81dc81 100644 --- a/ee/ucp/kubernetes/storage/use-vsphere-volumes.md +++ b/ee/ucp/kubernetes/storage/use-vsphere-volumes.md @@ -4,6 +4,8 @@ description: Learn how to add persistent storage to your Docker Enterprise clust keywords: Universal Control Plane, UCP, Docker Enterprise, Kubernetes, storage, volume --- +>{% include enterprise_label_shortform.md %} + The [vSphere Storage for Kubernetes driver](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/index.html) enables customers to address persistent storage requirements for Kubernetes pods in vSphere environments. The driver allows you to create a persistent volume on a Virtual Machine File System (VMFS), and use it to manage persistent storage requirements independent of pod and VM lifecycle. > Note diff --git a/ee/ucp/release-notes.md b/ee/ucp/release-notes.md index 355903a09b..d0150e5bee 100644 --- a/ee/ucp/release-notes.md +++ b/ee/ucp/release-notes.md @@ -10,6 +10,8 @@ redirect_from: - /datacenter/ucp/3.0/guides/release-notes/ --- +>{% include enterprise_label_shortform.md %} + Here you can learn about new features, bug fixes, breaking changes, and known issues for the latest UCP version. You can then use [the upgrade instructions](admin/install/upgrade.md) to upgrade your installation to the latest release. diff --git a/ee/ucp/swarm/deploy-multi-service-app.md b/ee/ucp/swarm/deploy-multi-service-app.md index 5e3c3cd084..efe751f43b 100644 --- a/ee/ucp/swarm/deploy-multi-service-app.md +++ b/ee/ucp/swarm/deploy-multi-service-app.md @@ -8,6 +8,8 @@ redirect_from: - /ee/ucp/swarm/deploy-from-ui/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane allows you to use the tools you already know, like `docker stack deploy` to deploy multi-service applications. You can also deploy your applications from the UCP web UI. diff --git a/ee/ucp/swarm/deploy-to-collection.md b/ee/ucp/swarm/deploy-to-collection.md index 6dc335ce65..509794673e 100644 --- a/ee/ucp/swarm/deploy-to-collection.md +++ b/ee/ucp/swarm/deploy-to-collection.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/services/deploy-stack-to-collection/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane enforces role-based access control when you deploy services. By default, you don't need to do anything, because UCP deploys your services to a default collection, unless you specify another one. You can diff --git a/ee/ucp/swarm/index.md b/ee/ucp/swarm/index.md index 95bc4df151..b323caf8fd 100644 --- a/ee/ucp/swarm/index.md +++ b/ee/ucp/swarm/index.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/services/deploy-a-service/ --- +>{% include enterprise_label_shortform.md %} + You can deploy and monitor your services from the UCP web UI. In this example we'll deploy an [NGINX](https://www.nginx.com/) web server and make it accessible on port `8000`. diff --git a/ee/ucp/swarm/use-secrets.md b/ee/ucp/swarm/use-secrets.md index ae53cde42e..46b4bde926 100644 --- a/ee/ucp/swarm/use-secrets.md +++ b/ee/ucp/swarm/use-secrets.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/secrets/ --- +>{% include enterprise_label_shortform.md %} + When deploying and orchestrating services, you often need to configure them with sensitive information like passwords, TLS certificates, or private keys. diff --git a/ee/ucp/ucp-architecture.md b/ee/ucp/ucp-architecture.md index fee48295f3..c0b2e2d925 100644 --- a/ee/ucp/ucp-architecture.md +++ b/ee/ucp/ucp-architecture.md @@ -4,6 +4,8 @@ description: Learn about the architecture of Docker Universal Control Plane. keywords: ucp, architecture --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane (UCP) is a containerized application that runs on [Docker Enterprise Edition](/ee/index.md), extending its functionality to simplify the deployment, configuration, and monitoring of your applications at scale. diff --git a/ee/ucp/user-access/cli.md b/ee/ucp/user-access/cli.md index b3635a0c68..fe683d0b20 100644 --- a/ee/ucp/user-access/cli.md +++ b/ee/ucp/user-access/cli.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/access-ucp/cli-based-access/ --- +>{% include enterprise_label_shortform.md %} + With Universal Control Plane you can continue using the tools you know and love like the Docker CLI client and kubectl. You just need to download and use a UCP client bundle. diff --git a/ee/ucp/user-access/index.md b/ee/ucp/user-access/index.md index c5e7dbfc5d..66c8f5c262 100644 --- a/ee/ucp/user-access/index.md +++ b/ee/ucp/user-access/index.md @@ -6,6 +6,8 @@ redirect_from: - /ee/ucp/user/access-ucp/ --- +>{% include enterprise_label_shortform.md %} + Docker Universal Control Plane allows you to manage your cluster in a visual way, from your browser. diff --git a/ee/ucp/user-access/kubectl.md b/ee/ucp/user-access/kubectl.md index 16f97b708b..279e023d8f 100644 --- a/ee/ucp/user-access/kubectl.md +++ b/ee/ucp/user-access/kubectl.md @@ -4,6 +4,8 @@ description: Learn how to install kubectl, the Kubernetes command-line tool, on keywords: ucp, cli, administration, kubectl, Kubernetes --- +>{% include enterprise_label_shortform.md %} + Docker Enterprise 2.0 and higher deploys Kubernetes as part of a UCP installation. Deploy, manage, and monitor Kubernetes workloads from the UCP dashboard. Users can also interact with the Kubernetes deployment through the Kubernetes diff --git a/engine/release-notes.md b/engine/release-notes.md index a475e40a3b..50824ca2c1 100644 --- a/engine/release-notes.md +++ b/engine/release-notes.md @@ -10,6 +10,8 @@ redirect_from: - /release-notes/docker-ce/ --- +>{% include enterprise_label_shortform.md %} + This document describes the latest changes, additions, known issues, and fixes for Docker Engine - Enterprise. diff --git a/reference/dtr/2.7/cli/backup.md b/reference/dtr/2.7/cli/backup.md index 8a845d7bc0..a754263d57 100644 --- a/reference/dtr/2.7/cli/backup.md +++ b/reference/dtr/2.7/cli/backup.md @@ -6,6 +6,8 @@ redirect_from: - /reference/dtr/2.5/cli/backup/ --- +>{% include enterprise_label_shortform.md %} + Create a backup of DTR ## Usage diff --git a/reference/dtr/2.7/cli/destroy.md b/reference/dtr/2.7/cli/destroy.md index b24252fb94..63d68ed1c8 100644 --- a/reference/dtr/2.7/cli/destroy.md +++ b/reference/dtr/2.7/cli/destroy.md @@ -4,6 +4,8 @@ description: Destroy a DTR replica's data keywords: dtr, cli, destroy --- +>{% include enterprise_label_shortform.md %} + Destroy a DTR replica's data ## Usage diff --git a/reference/dtr/2.7/cli/emergency-repair.md b/reference/dtr/2.7/cli/emergency-repair.md index 601beee374..43ce80abdd 100644 --- a/reference/dtr/2.7/cli/emergency-repair.md +++ b/reference/dtr/2.7/cli/emergency-repair.md @@ -4,6 +4,8 @@ description: Recover DTR from loss of quorum keywords: dtr, cli, emergency-repair --- +>{% include enterprise_label_shortform.md %} + Recover DTR from loss of quorum ## Usage diff --git a/reference/dtr/2.7/cli/images.md b/reference/dtr/2.7/cli/images.md index 3d1a8cd306..cc12007d1a 100644 --- a/reference/dtr/2.7/cli/images.md +++ b/reference/dtr/2.7/cli/images.md @@ -4,6 +4,8 @@ description: List all the images necessary to install DTR keywords: dtr, cli, images --- +>{% include enterprise_label_shortform.md %} + List all the images necessary to install DTR ## Usage diff --git a/reference/dtr/2.7/cli/index.md b/reference/dtr/2.7/cli/index.md index 90eddd1a5d..213aaa2616 100644 --- a/reference/dtr/2.7/cli/index.md +++ b/reference/dtr/2.7/cli/index.md @@ -4,6 +4,8 @@ description: Learn about the commands available in the docker/dtr image. keywords: dtr, install, uninstall, configure --- +>{% include enterprise_label_shortform.md %} + This tool has commands to install, configure, and backup Docker Trusted Registry (DTR). It also allows uninstalling DTR. By default the tool runs in interactive mode. It prompts you for diff --git a/reference/dtr/2.7/cli/install.md b/reference/dtr/2.7/cli/install.md index 37a29b738d..d9daad7312 100644 --- a/reference/dtr/2.7/cli/install.md +++ b/reference/dtr/2.7/cli/install.md @@ -4,6 +4,8 @@ description: Install Docker Trusted Registry keywords: dtr, cli, install --- +>{% include enterprise_label_shortform.md %} + Install Docker Trusted Registry ## Usage diff --git a/reference/dtr/2.7/cli/join.md b/reference/dtr/2.7/cli/join.md index d518a58877..cdfc7d4835 100644 --- a/reference/dtr/2.7/cli/join.md +++ b/reference/dtr/2.7/cli/join.md @@ -4,6 +4,8 @@ description: Add a new replica to an existing DTR cluster keywords: dtr, cli, join --- +>{% include enterprise_label_shortform.md %} + Add a new replica to an existing DTR cluster. Use SSH to log into any node that is already part of UCP. ## Usage diff --git a/reference/dtr/2.7/cli/reconfigure.md b/reference/dtr/2.7/cli/reconfigure.md index ca281e854e..24bfb2a218 100644 --- a/reference/dtr/2.7/cli/reconfigure.md +++ b/reference/dtr/2.7/cli/reconfigure.md @@ -4,6 +4,8 @@ description: Change DTR configurations keywords: dtr, cli, reconfigure --- +>{% include enterprise_label_shortform.md %} + Change DTR configurations. ## Usage diff --git a/reference/dtr/2.7/cli/remove.md b/reference/dtr/2.7/cli/remove.md index cc8720cb1e..5c1f7eab70 100644 --- a/reference/dtr/2.7/cli/remove.md +++ b/reference/dtr/2.7/cli/remove.md @@ -4,6 +4,8 @@ description: Remove a DTR replica from a cluster keywords: dtr, cli, remove --- +>{% include enterprise_label_shortform.md %} + Remove a DTR replica from a cluster ## Usage diff --git a/reference/dtr/2.7/cli/restore.md b/reference/dtr/2.7/cli/restore.md index 640a34f69c..799162ada0 100644 --- a/reference/dtr/2.7/cli/restore.md +++ b/reference/dtr/2.7/cli/restore.md @@ -4,6 +4,8 @@ description: Install and restore DTR from an existing backup keywords: dtr, cli, restore --- +>{% include enterprise_label_shortform.md %} + Install and restore DTR from an existing backup ## Usage diff --git a/reference/dtr/2.7/cli/upgrade.md b/reference/dtr/2.7/cli/upgrade.md index b885f5706b..c4a6b1ccc2 100644 --- a/reference/dtr/2.7/cli/upgrade.md +++ b/reference/dtr/2.7/cli/upgrade.md @@ -4,6 +4,8 @@ description: Upgrade DTR 2.5.x cluster to this version keywords: dtr, cli, upgrade --- +>{% include enterprise_label_shortform.md %} + Upgrade DTR 2.5.x cluster to this version ## Usage From 282169ffe30547980fbdc9abd24c999a6a94c1a6 Mon Sep 17 00:00:00 2001 From: KoryKessel-Docker Date: Fri, 20 Dec 2019 14:22:48 +0100 Subject: [PATCH 2/4] Fix of indenting (attempt 1). --- _includes/enterprise_label_shortform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/enterprise_label_shortform.md b/_includes/enterprise_label_shortform.md index b4f3cc9368..4dd552ab57 100644 --- a/_includes/enterprise_label_shortform.md +++ b/_includes/enterprise_label_shortform.md @@ -1,4 +1,4 @@ This topic applies to Docker Enterprise. -The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. For more information on the acquisition and how it may affect you and your business, refer to the [Docker Enterprise Customer FAQ](https://www.docker.com/faq-for-docker-enterprise-customers-and-partners). \ No newline at end of file +>The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. For more information on the acquisition and how it may affect you and your business, refer to the [Docker Enterprise Customer FAQ](https://www.docker.com/faq-for-docker-enterprise-customers-and-partners). \ No newline at end of file From 2a909ce470009dffbf4e2dc3a885f313f736b5a7 Mon Sep 17 00:00:00 2001 From: KoryKessel-Docker Date: Fri, 20 Dec 2019 14:32:09 +0100 Subject: [PATCH 3/4] Fix of indenting (attempt 2). --- _includes/enterprise_label_shortform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/enterprise_label_shortform.md b/_includes/enterprise_label_shortform.md index 4dd552ab57..43b76b16a3 100644 --- a/_includes/enterprise_label_shortform.md +++ b/_includes/enterprise_label_shortform.md @@ -1,4 +1,4 @@ This topic applies to Docker Enterprise. - +> >The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. For more information on the acquisition and how it may affect you and your business, refer to the [Docker Enterprise Customer FAQ](https://www.docker.com/faq-for-docker-enterprise-customers-and-partners). \ No newline at end of file From 6f7f0faac98146b912691123a09a761bb4a29632 Mon Sep 17 00:00:00 2001 From: KoryKessel-Docker Date: Fri, 20 Dec 2019 18:00:02 +0100 Subject: [PATCH 4/4] Fixed the ruby-version to allow for Netlify build. --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 2bf1c1ccf3..e75da3e63d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.3.6