From 62b78dd9de0ae9d0fdbdbb3e7cb9925881c7633d Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Sat, 25 Mar 2023 08:37:29 +0000 Subject: [PATCH] ENGDOCS-1274 (#16961) * ENGDOCS-1274 * move pages about * fix images * fix images * fix typo --- _data/toc.yaml | 36 ++++++++++--------- assets/images/sign-on.svg | 1 + assets/images/sso.svg | 1 + docker-hub/admin-overview.md | 70 ++++++++++++++++++++++++++++++++++++ docker-hub/index.md | 57 ++++++++++++++++++++++------- 5 files changed, 136 insertions(+), 29 deletions(-) create mode 100644 assets/images/sign-on.svg create mode 100644 assets/images/sso.svg create mode 100644 docker-hub/admin-overview.md diff --git a/_data/toc.yaml b/_data/toc.yaml index 1dd9d1ffb1..66a548505c 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1797,22 +1797,6 @@ manuals: title: Webhooks - path: /docker-hub/vulnerability-scanning/ title: Vulnerability scanning - - path: /docker-hub/audit-log/ - title: Audit logs - - sectiontitle: Security and authentication - section: - - path: /docker-hub/access-tokens/ - title: Create and manage access tokens - - sectiontitle: Two-factor authentication - section: - - path: /docker-hub/2fa/ - title: Enable two-factor authentication - - path: /docker-hub/2fa/disable-2fa/ - title: Disable two-factor authentication - - path: /docker-hub/2fa/recover-hub-account/ - title: Recover your Docker Hub account - - path: /docker-hub/2fa/new-recovery-code/ - title: Generate a new recovery code - path: /docker-hub/download-rate-limit/ title: Download rate limit - path: /docker-hub/image-management/ @@ -1842,8 +1826,10 @@ manuals: - path: /scout/artifactory/ title: Artifactory integration -- sectiontitle: Administration +- sectiontitle: Administration and security section: + - path: /docker-hub/admin-overview/ + title: Overview - sectiontitle: Onboarding section: - path: /docker-hub/onboard-team/ @@ -1884,8 +1870,24 @@ manuals: title: FAQs - path: /docker-hub/scim/ title: SCIM + - sectiontitle: Security and authentication + section: + - path: /docker-hub/access-tokens/ + title: Create and manage access tokens + - sectiontitle: Two-factor authentication + section: + - path: /docker-hub/2fa/ + title: Enable two-factor authentication + - path: /docker-hub/2fa/disable-2fa/ + title: Disable two-factor authentication + - path: /docker-hub/2fa/recover-hub-account/ + title: Recover your Docker Hub account + - path: /docker-hub/2fa/new-recovery-code/ + title: Generate a new recovery code - path: /docker-hub/group-mapping/ title: Group mapping + - path: /docker-hub/audit-log/ + title: Audit logs - path: /docker-hub/domain-audit/ title: Domain audit - path: /docker-hub/image-access-management/ diff --git a/assets/images/sign-on.svg b/assets/images/sign-on.svg new file mode 100644 index 0000000000..ae97ce20a9 --- /dev/null +++ b/assets/images/sign-on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/sso.svg b/assets/images/sso.svg new file mode 100644 index 0000000000..74c98cd475 --- /dev/null +++ b/assets/images/sso.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docker-hub/admin-overview.md b/docker-hub/admin-overview.md new file mode 100644 index 0000000000..6f5f0a29f2 --- /dev/null +++ b/docker-hub/admin-overview.md @@ -0,0 +1,70 @@ +--- +title: Administration +description: landing page for administration topic +keywords: administration, docker hub, admin +--- + +Sign in to Docker Hub to change account settings and carry out administrative or security-related tasks. + +
+ +
+
+
+
+ Set-up-an-org +
+

Set up an organization

+

Explore and set up an organization in Docker Hub

+
+
+
+
+
+ onboard +
+

Onboard users to your teams and organizations

+

Learn how to onboard with Docker Team or Docker Business subscription.

+
+
+
+
+
+ Release notes +
+

Use Hardened Docker Desktop

+

Explore the security model for Docker Desktop.

+
+
+
+ +
+
+
+
+ sign-in +
+

Enforce sign in

+

Configure sign in for members of your teams and organizations.

+
+
+
+
+
+ SSO +
+

Enable Single Sign-On

+

Understand and use Single Sign-On.

+
+
+
+
+
+ 2fa +
+

Set up two-factor authentication

+

Add an extra layer of authentication to your Docker account.

+
+
+
+
diff --git a/docker-hub/index.md b/docker-hub/index.md index 63bce5b624..78822ab979 100644 --- a/docker-hub/index.md +++ b/docker-hub/index.md @@ -4,16 +4,35 @@ keywords: Docker, docker, docker hub, hub, overview title: Overview --- -[Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} is a service provided by Docker for -finding and sharing container images with your team. It's the world’s largest repository of container images with an array of content sources including container community developers, open source projects and independent software vendors (ISV) building and distributing their code in containers. +Docker Hub is a service provided by Docker for finding and sharing container images. -Users get access to free public repositories for storing and sharing images or can choose a [subscription plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} for private repositories. +It's the world’s largest repository of container images with an array of content sources including container community developers, open source projects and independent software vendors (ISV) building and distributing their code in containers. -Docker Hub provides the following major features: +Docker Hub is also where you can go to [change your Docker account settings and carry out administrative tasks](admin-overview.md). + + + +
+
* [Repositories](../docker-hub/repos/index.md): Push and pull container images. -* [Teams & Organizations](orgs.md): Manage access to private -repositories of container images. * [Docker Official Images](official_images.md): Pull and use high-quality container images provided by Docker. * [Docker Verified Publisher Images](publish/index.md): Pull and use high- @@ -24,8 +43,22 @@ quality container images from non-commercial open source projects. GitHub and Bitbucket and push them to Docker Hub. * [Webhooks](webhooks.md): Trigger actions after a successful push to a repository to integrate Docker Hub with other services. +*[Docker Hub CLI](https://github.com/docker/hub-tool#readme){: target="_blank" rel="noopener" class="_"} tool (currently experimental) and an API that allows you to interact with Docker Hub. Browse through the [Docker Hub API](/docker-hub/api/latest/){: target="_blank" rel="noopener" class="_"} documentation to explore the supported endpoints. -Docker provides a [Docker Hub CLI](https://github.com/docker/hub-tool#readme){: target="_blank" rel="noopener" class="_"} tool (currently experimental) and an API that allows you to interact with Docker Hub. Browse through the [Docker Hub API](/docker-hub/api/latest/){: target="_blank" rel="noopener" class="_"} documentation to explore the supported endpoints. +
+
+ +* [Create and manage teams & organizations](orgs.md) +* [Create a company](creating-companies.md) +* [Enforce sign in](configure-sign-in.md) +* Set up [SSO](../single-sign-on/index.md) and [SCIM](scim.md) +* Use [Group mapping](group-mapping.md) +* [Carry out domain audits](domain-audit.md) +* [Use Image Access Management](image-access-management.md) to control developers' access to certain types of images +* [Enable Registry Access Management](../desktop/hardened-desktop/registry-access-management.md) + +
+
@@ -35,7 +68,7 @@ Docker provides a [Docker Hub CLI](https://github.com/docker/hub-tool#readme){:
Docker ID
-

Create a Docker ID

+

Create an account

Sign up and create a new Docker ID

@@ -62,12 +95,12 @@ Docker provides a [Docker Hub CLI](https://github.com/docker/hub-tool#readme){:
- - secure + + secure
-

Manage access tokens

-

Create personal access tokens as an alternative to your password.

+

Use Automated builds

+

Create and manage automated builds and autotesting.