From 3f0c3c3297e19984c18a219ae33f9b69adfdfd57 Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Mon, 11 Sep 2017 17:08:22 -0700 Subject: [PATCH] Replace Datacenter with Docker EE (#4566) --- .../admin/configure/set-up-vulnerability-scans.md | 12 +++++------- .../2.3/guides/admin/install/system-requirements.md | 2 +- .../admin/manage-users/create-and-manage-users.md | 6 +++--- .../dtr/2.3/guides/admin/manage-users/index.md | 2 +- .../guides/admin/manage-users/permission-levels.md | 9 ++++----- .../2.2/guides/access-control/permission-levels.md | 12 ++++++------ datacenter/ucp/2.2/guides/user/secrets/index.md | 6 +++--- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md b/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md index 451c7fda10..c35e6ed8dc 100644 --- a/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md +++ b/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md @@ -35,13 +35,11 @@ this step and proceed to [enable DTR Security Scanning](#enable-dtr-security-sca If your current DTR license doesn't include scanning, you must first download the new license. 1. Log in to the Docker Store using a Docker ID with access to the license you need. -2. In the top right corner, click your user account icon, and select **Subscriptions**. -3. If necessary, select an organization account from the **Accounts** menu at the upper right. -4. Locate Docker Datacenter in the **Subscriptions** list. -5. Click **Subscription Details** and select **Setup instructions**. -6. Click **License key** below the Docker Datacenter logo. - The license key (a `.lic` file) is downloaded to your local computer. - ![](../../images/security-scanning-setup-1.png){: .with-border} +2. In the top right corner, click your user account icon, and select **My Content**. +3. Locate **Docker Enterprise Edition** in the content list, and click **Setup**. +4. Click **License Key** to download the license. + ![](../../images/security-scanning-setup-1.png){: .with-border} + Next, install the new license on the DTR instance. 7. Log in to your DTR instance using an administrator account. diff --git a/datacenter/dtr/2.3/guides/admin/install/system-requirements.md b/datacenter/dtr/2.3/guides/admin/install/system-requirements.md index c90e41d9b7..07bb7f3330 100644 --- a/datacenter/dtr/2.3/guides/admin/install/system-requirements.md +++ b/datacenter/dtr/2.3/guides/admin/install/system-requirements.md @@ -28,7 +28,7 @@ These ports are configurable when installing DTR. ## Compatibility and maintenance lifecycle -Docker Datacenter is a software subscription that includes 3 products: +Docker Enterprise Edition is a software subscription that includes 3 products: * Docker Engine EE, * Docker Trusted Registry, diff --git a/datacenter/dtr/2.3/guides/admin/manage-users/create-and-manage-users.md b/datacenter/dtr/2.3/guides/admin/manage-users/create-and-manage-users.md index 235f3a563a..34799b07fe 100644 --- a/datacenter/dtr/2.3/guides/admin/manage-users/create-and-manage-users.md +++ b/datacenter/dtr/2.3/guides/admin/manage-users/create-and-manage-users.md @@ -4,9 +4,9 @@ description: Learn how to manage user permissions in Docker Trusted Registry. keywords: registry, security, permissions, users --- -When using the Docker Datacenter built-in authentication, you can create users +When using the built-in authentication, you can create users to grant them fine-grained permissions. -Users are shared across Docker Datacenter. When you create a new user in +Users are shared across UCP and DTR. When you create a new user in Docker Universal Control Plane, that user becomes available in DTR and vice versa. @@ -20,7 +20,7 @@ Click the **New user** button, and fill-in the user information. ![](../../images/create-manage-users-2.png){: .with-border} Check the **Trusted Registry admin** option, if you want to grant permissions -for the user to change Docker Datacenter configurations. +for the user to be a UCP and DTR administrator. ## Where to go next diff --git a/datacenter/dtr/2.3/guides/admin/manage-users/index.md b/datacenter/dtr/2.3/guides/admin/manage-users/index.md index da5f96e1ce..0d02ca49e2 100644 --- a/datacenter/dtr/2.3/guides/admin/manage-users/index.md +++ b/datacenter/dtr/2.3/guides/admin/manage-users/index.md @@ -13,7 +13,7 @@ repositories. For that: * Start by creating a user. - Users are shared across Docker Datacenter. When you create a new user in + Users are shared across UCP and DTR. When you create a new user in Docker Universal Control Plane, that user becomes available in DTR and vice versa. Registered users can create and manage their own repositories. diff --git a/datacenter/dtr/2.3/guides/admin/manage-users/permission-levels.md b/datacenter/dtr/2.3/guides/admin/manage-users/permission-levels.md index ce261e5788..2d3908cbc8 100644 --- a/datacenter/dtr/2.3/guides/admin/manage-users/permission-levels.md +++ b/datacenter/dtr/2.3/guides/admin/manage-users/permission-levels.md @@ -9,14 +9,13 @@ repositories. ## Administrator users -Users are shared across Docker Datacenter. When you create a new user in Docker +Users are shared across UCP and DTR. When you create a new user in Docker Universal Control Plane, that user becomes available in DTR and vice versa. -When you create an administrator user in DTR, that user is a Docker Datacenter -administrator, with permissions to: +When you create an administrator user in DTR, the user has permissions to: -* Manage users across Docker Datacenter, +* Manage users across UCP and DTR, * Manage DTR repositories and settings, -* Manage the whole UCP cluster. +* Manage UCP resources and settings. ## Team permission levels diff --git a/datacenter/ucp/2.2/guides/access-control/permission-levels.md b/datacenter/ucp/2.2/guides/access-control/permission-levels.md index d79eeec03b..871f43d2a3 100644 --- a/datacenter/ucp/2.2/guides/access-control/permission-levels.md +++ b/datacenter/ucp/2.2/guides/access-control/permission-levels.md @@ -8,7 +8,7 @@ title: Roles and permission levels Docker Universal Control Plane has two types of users: administrators and regular users. Administrators can make changes to the UCP swarm, while regular users have permissions that range from no access to full control over -resources like volumes, networks, images, and containers. Users are +resources like volumes, networks, images, and containers. Users are grouped into teams and organizations. ![Diagram showing UCP permission levels](../images/role-diagram.svg) @@ -29,9 +29,9 @@ swarm settings. This includes: A role is a set of permitted API operations on a collection that you can assign to a specific user, team, or organization by using a grant. -UCP administrators view and manage roles by navigating to the **Roles** page. +UCP administrators view and manage roles by navigating to the **Roles** page. -The system provides the following default roles: +The system provides the following default roles: | Built-in role | Description | |----------------------|-------------| @@ -61,7 +61,7 @@ might give it a name like "Node Operator". ![](../images/custom-role.png){: .with-border} -You can give a role a global name, like "Remove Images", which might enable +You can give a role a global name, like "Remove Images", which might enable the **Remove** and **Force Remove** operations for images. You can apply a role with the same name to different collections. @@ -70,10 +70,10 @@ Roles can't be edited, so to change a role's API operations, you must delete it and create it again. You can't delete a custom role if it's used in a grant. You must first delete -the grants that use the role. +the grants that use the role. ## Where to go next * [Create and manage users](create-and-manage-users.md) * [Create and manage teams](create-and-manage-teams.md) -* [Docker Reference Architecture: Securing Docker Datacenter and Security Best Practices](https://success.docker.com/KBase/Docker_Reference_Architecture%3A_Securing_Docker_Datacenter_and_Security_Best_Practices) +* [Docker Reference Architecture: Securing Docker EE and Security Best Practices](https://success.docker.com/Architecture/Docker_Reference_Architecture%3A_Securing_Docker_EE_and_Security_Best_Practices) diff --git a/datacenter/ucp/2.2/guides/user/secrets/index.md b/datacenter/ucp/2.2/guides/user/secrets/index.md index 582f935257..437aae55ef 100644 --- a/datacenter/ucp/2.2/guides/user/secrets/index.md +++ b/datacenter/ucp/2.2/guides/user/secrets/index.md @@ -1,6 +1,6 @@ --- title: Manage secrets -description: Learn how to manage your passwords, certificates, and other secrets in a secure way with Docker Datacenter +description: Learn how to manage your passwords, certificates, and other secrets in a secure way with Docker EE keywords: UCP, secret, password, certificate, private key --- @@ -66,7 +66,7 @@ default configurations. Now create the MySQL service: -1. Navigate to the **Services** page and click **Create Service**. Name the +1. Navigate to the **Services** page and click **Create Service**. Name the service "wordpress-db", and for the **Task Template**, use the "mysql:5.7" image. 2. In the left pane, click **Network**. In the **Networks** section, click @@ -99,7 +99,7 @@ the root password. Now that the MySQL service is running, we can deploy a WordPress service that uses MySQL as a storage backend: -1. Navigate to the **Services** page and click **Create Service**. Name the +1. Navigate to the **Services** page and click **Create Service**. Name the service "wordpress", and for the **Task Template**, use the "wordpress:latest" image. 2. In the left pane, click **Network**. In the **Networks** section, click