From 4b21fc22d1697bd9de45754c5b22080816eead2e Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 17 Mar 2025 15:10:36 +0000 Subject: [PATCH 1/2] Merge pull request #22262 from aevesdocker/ENGDOCS-2489 ENGDOCS-2489 --- content/reference/compose-file/merge.md | 2 +- content/reference/compose-file/networks.md | 34 ++++++++++++++++++ content/reference/compose-file/services.md | 42 +++++++++++++++++++--- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/content/reference/compose-file/merge.md b/content/reference/compose-file/merge.md index 2c50ce4359db..7b9a5784831d 100644 --- a/content/reference/compose-file/merge.md +++ b/content/reference/compose-file/merge.md @@ -142,7 +142,7 @@ services: In addition to the previously described mechanism, an override Compose file can also be used to remove elements from your application model. For this purpose, the custom [YAML tag](https://yaml.org/spec/1.2.2/#24-tags) `!reset` can be set to -override a value set by the overriden Compose file. A valid value for attribute must be provided, +override a value set by the overridden Compose file. A valid value for attribute must be provided, but will be ignored and target attribute will be set with type's default value or `null`. For readability, it is recommended to explicitly set the attribute value to the null (`null`) or empty diff --git a/content/reference/compose-file/networks.md b/content/reference/compose-file/networks.md index a1ae916e4c32..c8c30a3e1b58 100644 --- a/content/reference/compose-file/networks.md +++ b/content/reference/compose-file/networks.md @@ -62,6 +62,40 @@ networks: The advanced example shows a Compose file which defines two custom networks. The `proxy` service is isolated from the `db` service, because they do not share a network in common. Only `app` can talk to both. +## The default network + +When a Compose file doesn't declare explicit networks, Compose uses an implicit `default` network. Services without an explicit [`networks`](services.md#networks) declaration are connected by Compose to this `default` network: + + +```yml +services: + some-service: + image: foo +``` +This example is actually equivalent to: + +```yml +services: + some-service: + image: foo + networks: + default: {} +networks: + default: {} +``` + +You can customize the `default` network with an explicit declaration: + +```yml +networks: + default: + name: a_network # Use a custom name + driver_opts: # pass options to driver for network creation + com.docker.network.bridge.host_binding_ipv4: 127.0.0.1 +``` + +For options, see the [Docker Engine docs](https://docs.docker.com/engine/network/drivers/bridge/#options). + ## Attributes ### `driver` diff --git a/content/reference/compose-file/services.md b/content/reference/compose-file/services.md index 017481feb6ea..3b14cc48590b 100644 --- a/content/reference/compose-file/services.md +++ b/content/reference/compose-file/services.md @@ -1321,6 +1321,28 @@ services: ``` For more information about the `networks` top-level element, see [Networks](networks.md). +### Implicit default network + +If `networks` is empty or absent from the Compose file, Compose considers an implicit definition for the service to be +connected to the `default` network: + +```yml +services: + some-service: + image: foo +``` +This example is actually equivalent to: + +```yml +services: + some-service: + image: foo + networks: + default: {} +``` + +If you want the service to not be connected a network, you must set [`network_mode: none`](#network_mode). + #### `aliases` `aliases` declares alternative hostnames for the service on the network. Other containers on the same @@ -1675,13 +1697,23 @@ services: `pull_policy` defines the decisions Compose makes when it starts to pull images. Possible values are: -* `always`: Compose always pulls the image from the registry. -* `never`: Compose doesn't pull the image from a registry and relies on the platform cached image. +- `always`: Compose always pulls the image from the registry. +- `never`: Compose doesn't pull the image from a registry and relies on the platform cached image. If there is no cached image, a failure is reported. -* `missing`: Compose pulls the image only if it's not available in the platform cache. +- `missing`: Compose pulls the image only if it's not available in the platform cache. This is the default option if you are not also using the [Compose Build Specification](build.md). `if_not_present` is considered an alias for this value for backward compatibility. -* `build`: Compose builds the image. Compose rebuilds the image if it's already present. +- `build`: Compose builds the image. Compose rebuilds the image if it's already present. +- `daily`: Compose checks the registry for image updates if the last pull took place more than 24 hours ago. +- `weekly`: Compose checks the registry for image updates if the last pull took place more than 7 days ago. +- `every_`: Compose checks the registry for image updates if the last pull took place before ``. Duration can be expressed in weeks (`w`), days (`d`), hours (`h`), minutes (`m`), seconds (`s`) or a combination of these. + +```yaml +services: + test: + image: nginx + pull_policy: every_12h +``` ### `read_only` @@ -1779,6 +1811,8 @@ the service's containers. The default value is world-readable permissions (mode `0444`). The writable bit must be ignored if set. The executable bit may be set. +Note that support for `uid`, `gid`, and `mode` attributes are not implemented in Docker Compose when the source of the secret is a [`file`](secrets.md). This is because bind-mounts used under the hood don't allow uid remapping. + The following example sets the name of the `server-certificate` secret file to `server.cert` within the container, sets the mode to `0440` (group-readable), and sets the user and group to `103`. The value of `server-certificate` is set From a7a2a5217ed6fe8aebe2483e10bb267cddbd5bc0 Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Mon, 17 Mar 2025 10:07:57 -0700 Subject: [PATCH 2/2] hub: sidebar nav (#22123) ## Description Updated Hub nav items to new left nav. ![image](https://github.com/user-attachments/assets/30fc20be-d999-426e-bef6-55cd535d5735) ## Related issues or tickets ENGDOCS -2447 ## Reviews - [ ] Editorial review - [ ] Product review Signed-off-by: Craig --- content/guides/jupyter.md | 4 ++-- content/guides/tensorflowjs.md | 2 +- .../admin/organization/convert-account.md | 2 +- .../admin/organization/deactivate-account.md | 4 ++-- .../admin/organization/manage-a-team.md | 14 ++++++------- content/manuals/admin/organization/members.md | 18 ++++++++--------- content/manuals/admin/organization/orgs.md | 4 ++-- content/manuals/billing/cycle.md | 6 +++--- content/manuals/docker-hub/repos/archive.md | 4 ++-- content/manuals/docker-hub/repos/create.md | 2 +- content/manuals/docker-hub/repos/delete.md | 2 +- .../manuals/docker-hub/repos/manage/access.md | 6 +++--- .../repos/manage/builds/automated-testing.md | 2 +- .../images/docker-hub-repo-settings-menu.png | Bin 7091 -> 0 bytes .../repos/manage/builds/link-source.md | 19 ++++++++---------- .../repos/manage/builds/manage-builds.md | 2 +- .../docker-hub/repos/manage/builds/setup.md | 4 ++-- .../repos/manage/hub-images/manage.md | 2 +- .../repos/manage/hub-images/move.md | 2 +- .../repos/manage/hub-images/tags.md | 4 ++-- .../docker-hub/repos/manage/information.md | 6 +++--- .../trusted-content/insights-analytics.md | 4 ++-- .../repos/manage/vulnerability-scanning.md | 10 ++++----- content/manuals/docker-hub/repos/settings.md | 15 ++++++-------- .../for-admins/single-sign-on/configure.md | 2 +- .../for-admins/single-sign-on/connect.md | 2 +- layouts/shortcodes/admin-domain-audit.md | 2 +- layouts/shortcodes/admin-domains.html | 2 +- layouts/shortcodes/admin-image-access.html | 2 +- layouts/shortcodes/admin-org-audit-log.html | 2 +- layouts/shortcodes/admin-registry-access.html | 2 +- layouts/shortcodes/admin-scim-disable.html | 5 ++--- layouts/shortcodes/admin-scim.html | 5 ++--- layouts/shortcodes/admin-sso-config.md | 2 +- layouts/shortcodes/admin-sso-connect.md | 2 +- .../admin-sso-management-connections.md | 4 ++-- .../shortcodes/admin-sso-management-orgs.md | 2 +- layouts/shortcodes/admin-sso-management.md | 2 +- layouts/shortcodes/admin-users.html | 2 +- 39 files changed, 84 insertions(+), 92 deletions(-) delete mode 100644 content/manuals/docker-hub/repos/manage/builds/images/docker-hub-repo-settings-menu.png diff --git a/content/guides/jupyter.md b/content/guides/jupyter.md index 3f78c73a7858..9697b3556dbd 100644 --- a/content/guides/jupyter.md +++ b/content/guides/jupyter.md @@ -371,7 +371,7 @@ To share your image and data, you'll use [Docker Hub](https://hub.docker.com/). 4. Verify that you pushed the image to Docker Hub. 1. Go to [Docker Hub](https://hub.docker.com). - 2. Select **Repositories**. + 2. Select **My Hub** > **Repositories**. 3. View the **Last pushed** time for your repository. Other users can now download and run your image using the `docker run` command. They need to replace `YOUR-USER-NAME` with your Docker ID. @@ -395,7 +395,7 @@ This example uses the Docker Desktop graphical user interface. Alternatively, in 8. Select **Save**. 9. Verify that you exported the volume to Docker Hub. 1. Go to [Docker Hub](https://hub.docker.com). - 2. Select **Repositories**. + 2. Select **My Hub** > **Repositories**. 3. View the **Last pushed** time for your repository. Other users can now download and import your volume. To import the volume and then run it with your image: diff --git a/content/guides/tensorflowjs.md b/content/guides/tensorflowjs.md index ecbd89bc6b48..cd988f74aebf 100644 --- a/content/guides/tensorflowjs.md +++ b/content/guides/tensorflowjs.md @@ -533,7 +533,7 @@ developer ecosystem. To share your image: 4. Verify that you pushed the image to Docker Hub. 1. Go to [Docker Hub](https://hub.docker.com). - 2. Select **Repositories**. + 2. Select **My Hub** > **Repositories**. 3. View the **Last pushed** time for your repository. Other users can now download and run your image using the `docker run` command. They need to replace `YOUR-USER-NAME` with your Docker ID. diff --git a/content/manuals/admin/organization/convert-account.md b/content/manuals/admin/organization/convert-account.md index 3ac7f86f965e..5b1aa3547f2e 100644 --- a/content/manuals/admin/organization/convert-account.md +++ b/content/manuals/admin/organization/convert-account.md @@ -24,7 +24,7 @@ Before you convert a user account to an organization, ensure that you meet the f - The user account that you want to convert must not be a member of a company or any teams or organizations. You must remove the account from all teams, organizations, or the company. To do this: - 1. Navigate to **Organizations** and then select the organization(s) you need to leave. + 1. Navigate to **My Hub** and then select the organization you need to leave. 2. Find your username in the **Members** tab. 3. Select the **More options** menu and then select **Leave organization**. diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md index 77a0dab78df0..9f82fbe267f8 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -49,9 +49,9 @@ Once you have completed all the previous steps, you can deactivate your organiza {{< /tab >}} {{< tab name="Docker Hub" >}} -1. On Docker Hub, select **Organizations**. +1. On Docker Hub, select **My Hub**. 2. Choose the organization you want to deactivate. -3. In **Settings**, select the **Deactivate Org** tab and then **Deactivate organization**. +3. In **Settings**, select the **Deactivate org** and then **Deactivate organization**. {{< /tab >}} {{< /tabs >}} diff --git a/content/manuals/admin/organization/manage-a-team.md b/content/manuals/admin/organization/manage-a-team.md index 675a3ed0935d..5a12db5e995a 100644 --- a/content/manuals/admin/organization/manage-a-team.md +++ b/content/manuals/admin/organization/manage-a-team.md @@ -38,8 +38,8 @@ The organization owner can also add additional organization owners to help them {{< tab name="Docker Hub" >}} 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations** and choose your organization. -3. Select the **Teams** tab and then select **Create Team**. +2. Select **My Hub** and choose your organization. +3. Select the **Teams** and then select **Create Team**. 4. Fill out your team's information and select **Create**. 5. [Add members to your team](members.md#add-a-member-to-a-team). @@ -65,8 +65,8 @@ access. Note that organization owners have full administrative access to all rep To give a team access to a repository: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations** and choose your organization. -3. Select the **Teams** tab and select the team that you'd like to configure repository access to. +2. Select **My Hub** and choose your organization. +3. Select the **Teams** and select the team that you'd like to configure repository access to. 4. Select the **Permissions** tab and select a repository from the **Repository** drop-down. 5. Choose a permission from the **Permissions** drop-down list and select @@ -109,7 +109,7 @@ you automatically have "Read-only" permissions: To view a team's permissions across all repositories: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations** and choose your organization. +2. Select **My Hub** and choose your organization. 3. Select **Teams** and choose your team name. 4. Select the **Permissions** tab, where you can view the repositories this team can access. @@ -121,8 +121,8 @@ Organization owners can delete a team in Docker Hub or Admin Console. When you r {{< tab name="Docker Hub" >}} 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations** and choose your organization. -3. Select the **Teams** tab. +2. Select **My Hub** and choose your organization. +3. Select **Teams**. 4. Select the name of the team that you want to delete. 5. Select **Settings**. 6. Select **Delete Team**. diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 33634a2ebdd5..dba13af4b787 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -47,8 +47,8 @@ address you received the invitation through. 4. Optional. If you do not have an account and created one, you must navigate back to your email inbox and verify your email address using the Docker verification email. -5. Once you are signed in to Docker Hub, select **Organizations** from the top-level navigation menu. -6. The organizations page will display your invitation. Select **Accept**. +5. Once you are signed in to Docker Hub, select **My Hub** from the top-level navigation menu. +6. Select **Accept** on your invitation. After accepting an invitation, you are now a member of the organization. @@ -64,7 +64,7 @@ After inviting members, you can resend or remove invitations as needed. To resend an invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **Organizations**, your organization, and then **Members**. +2. Select **My Hub**, your organization, and then **Members**. 3. In the table, locate the invitee, select the **Actions** icon, and then select **Resend invitation**. 4. Select **Invite** to confirm. @@ -93,7 +93,7 @@ To resend an invitation from the Admin Console: To remove a member's invitation from Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **Organizations**, your organization, and then **Members**. +2. Select **My Hub**, your organization, and then **Members**. 3. In the table, select the **Action** icon, and then select **Remove member** or **Remove invitee**. 4. Follow the on-screen instructions to remove the member or invitee. @@ -125,12 +125,12 @@ Use Docker Hub or the Admin Console to add or remove team members. Organization To add a member to a team with Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations**, your organization, and then **Members**. +2. Select **My Hub**, your organization, and then **Members**. 3. Select the **Action** icon, and then select **Add to team**. > [!NOTE] > - > You can also navigate to **Organizations** > **Your Organization** > **Teams** > **Your Team Name** and select **Add Member**. Select a member from the drop-down list to add them to the team or search by Docker ID or email. + > You can also navigate to **My Hub** > **Your Organization** > **Teams** > **Your Team Name** and select **Add Member**. Select a member from the drop-down list to add them to the team or search by Docker ID or email. 4. Select the team and then select **Add**. > [!NOTE] @@ -167,7 +167,7 @@ Organization owners can remove a member from a team in Docker Hub or Admin Conso To remove a member from a specific team with Docker Hub: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations**, your organization, **Teams**, and then the team. +2. Select **My Hub**, your organization, **Teams**, and then the team. 3. Select the **X** next to the user’s name to remove them from the team. 4. When prompted, select **Remove** to confirm. @@ -198,7 +198,7 @@ the company owner can also manage that organization's roles. If you have SSO ena To update a member role: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations**, your organization, and then **Members**. +2. Select **My Hub**, your organization, and then **Members**. 3. Find the username of the member whose role you want to edit. In the table, select the **Actions** icon. 4. Select **Edit role**. 5. Select their organization, select the role you want to assign, and then select **Save**. @@ -221,7 +221,7 @@ Owners can export a CSV file containing all members. The CSV file for a company To export a CSV file of your members: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations**, your organization, and then **Members**. +2. Select **My Hub**, your organization, and then **Members**. 3. Select the **Action** icon and then select **Export users as CSV**. {{< /tab >}} diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index bccc20749b65..8e4e602fa09a 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -29,7 +29,7 @@ detailed instructions on converting an existing user account to an organization, {{< tab name="Docker Hub" >}} 1. Sign in to [Docker Hub](https://hub.docker.com/) using your Docker ID, your email address, or your social provider. -2. Select **Organizations** and then **Create Organization** to create a new organization. +2. Select **My Hub**, select the account drop-down, and then **Create Organization** to create a new organization. 3. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan. 4. Select **Continue to profile**. 5. Enter an **Organization namespace**. This is the official, unique name for @@ -103,7 +103,7 @@ To view an organization: > then you are neither a member or an owner of it. An organization > administrator needs to add you as a member of the organization. -2. Select **Organizations** in the top navigation bar, then choose your +2. Select **My Hub** in the top navigation bar, then choose your organization from the list. The organization landing page displays various options that let you to diff --git a/content/manuals/billing/cycle.md b/content/manuals/billing/cycle.md index c077147f382f..a8f5b2e09c5f 100644 --- a/content/manuals/billing/cycle.md +++ b/content/manuals/billing/cycle.md @@ -79,9 +79,9 @@ To change your organization's billing cycle: To change your organization's billing cycle: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Organizations** from the top-level navigation. -3. Select the organization that you want to change the payment method for. -4. In the bottom-right of the **Plan** tab, select **Switch to annual billing**. +2. Select **My Hub** from the top-level navigation. +3. Select the organization that you want to change the payment method for, and then select **Billing**. +4. Select **Switch to annual billing**. 5. Review the information displayed on the **Change to an Annual subscription** page and select **Accept Terms and Purchase** to confirm. {{< /tab >}} diff --git a/content/manuals/docker-hub/repos/archive.md b/content/manuals/docker-hub/repos/archive.md index 18c89bfccc27..079059b598aa 100644 --- a/content/manuals/docker-hub/repos/archive.md +++ b/content/manuals/docker-hub/repos/archive.md @@ -35,7 +35,7 @@ unarchived, the following occurs: ## Archive a repository 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -51,7 +51,7 @@ unarchived, the following occurs: ## Unarchive a repository 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. diff --git a/content/manuals/docker-hub/repos/create.md b/content/manuals/docker-hub/repos/create.md index 3cc4d97c826a..8bbb8513b573 100644 --- a/content/manuals/docker-hub/repos/create.md +++ b/content/manuals/docker-hub/repos/create.md @@ -8,7 +8,7 @@ weight: 20 --- 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. 3. Near the top-right corner, select **Create repository**. 4. Select a **Namespace**. diff --git a/content/manuals/docker-hub/repos/delete.md b/content/manuals/docker-hub/repos/delete.md index 46e27c1ea2e9..3de3414547b4 100644 --- a/content/manuals/docker-hub/repos/delete.md +++ b/content/manuals/docker-hub/repos/delete.md @@ -13,7 +13,7 @@ weight: 40 > settings. This action can't be undone. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. diff --git a/content/manuals/docker-hub/repos/manage/access.md b/content/manuals/docker-hub/repos/manage/access.md index ed190257f327..4dbf8f2d88d5 100644 --- a/content/manuals/docker-hub/repos/manage/access.md +++ b/content/manuals/docker-hub/repos/manage/access.md @@ -39,7 +39,7 @@ change the visibility after the repository has been created. To change repository visibility: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. 3. Select a repository. The **General** page for the repository appears. @@ -75,7 +75,7 @@ teams, or organization access tokens to manage access. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -111,7 +111,7 @@ To configure team repository permissions: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. diff --git a/content/manuals/docker-hub/repos/manage/builds/automated-testing.md b/content/manuals/docker-hub/repos/manage/builds/automated-testing.md index e01bc9cce4a7..79d381757cf6 100644 --- a/content/manuals/docker-hub/repos/manage/builds/automated-testing.md +++ b/content/manuals/docker-hub/repos/manage/builds/automated-testing.md @@ -73,7 +73,7 @@ branch or tag, and you do not need to enable it at all. Only branches that are configured to use autobuild push images to the Docker repository, regardless of the Autotest settings. -1. Sign in to Docker Hub and select **Repositories**. +1. Sign in to Docker Hub and select **My Hub** > **Repositories**. 2. Select the repository you want to enable `Autotest` on. diff --git a/content/manuals/docker-hub/repos/manage/builds/images/docker-hub-repo-settings-menu.png b/content/manuals/docker-hub/repos/manage/builds/images/docker-hub-repo-settings-menu.png deleted file mode 100644 index 727359beda4ec419308487d18047aa24db063263..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7091 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 diff --git a/content/manuals/docker-hub/repos/manage/builds/link-source.md b/content/manuals/docker-hub/repos/manage/builds/link-source.md index 026e3872e874..61e270190cc7 100644 --- a/content/manuals/docker-hub/repos/manage/builds/link-source.md +++ b/content/manuals/docker-hub/repos/manage/builds/link-source.md @@ -27,12 +27,9 @@ If you are linking a source code provider to create autobuilds for a team, follo 1. Sign in to Docker Hub. -2. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. +2. Select **My Hub** > **Settings** > **Linked accounts**. - ![Repository settings menu](./images/docker-hub-repo-settings-menu.png) - - -3. From the **Linked accounts** tab, select **Link provider** for the source provider you want to link. +3. Select **Link provider** for the source provider you want to link. If you want to unlink your current GitHub account and relink to a new GitHub account, make sure to completely sign out of [GitHub](https://github.com/) before linking via Docker Hub. @@ -102,9 +99,9 @@ To revoke Docker Hub's access to an organization's GitHub repositories: To revoke Docker Hub's access to your GitHub account, you must unlink it both from Docker Hub, and from your GitHub account. -1. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. +1. Select **My Hub** > **Settings** > **Linked accounts**. -2. From the **Linked accounts** tab, select the plug icon next to the source provider you want to remove. +2. Select **Unlink provider** next to the source provider you want to remove. 3. Go to your GitHub account's **Settings** page. @@ -123,9 +120,9 @@ code provider. 1. Sign in to Docker Hub using your Docker ID. -2. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. +2. Select **My Hub** > **Settings** > **Linked accounts**. -3. From the **Linked accounts** tab, select **Link provider** for the source provider you want to link. +3. Select **Link provider** for the source provider you want to link. 4. If necessary, sign in to Bitbucket. @@ -138,9 +135,9 @@ unlink it both from Docker Hub, and revoke authorization in your Bitbucket accou 1. Sign in to Docker Hub. -2. Select the **Settings** icon in the top-right navigation, then select **Repository Settings**. +2. Select **My Hub** > **Settings** > **Linked accounts**. -3. From the **Linked accounts** tab, select the **Plug** icon next to the source provider you want to remove. +3. Select **Unlink provider** next to the source provider you want to remove. > [!IMPORTANT] > After unlinking the account on Docker Hub, you must also revoke the authorization on the Bitbucket end. diff --git a/content/manuals/docker-hub/repos/manage/builds/manage-builds.md b/content/manuals/docker-hub/repos/manage/builds/manage-builds.md index c199e918a6f8..d1951da03592 100644 --- a/content/manuals/docker-hub/repos/manage/builds/manage-builds.md +++ b/content/manuals/docker-hub/repos/manage/builds/manage-builds.md @@ -48,7 +48,7 @@ a while, for example when you are doing major refactoring in your code. Disablin To disable an automated build: -1. From the **Repositories** page, select a repository, and select the **Builds** tab. +1. In [Docker Hub](https://hub.docker.com), go to **My Hub** > **Repositories**, select a repository, and select the **Builds** tab. 2. Select **Configure automated builds** to edit the repository's build settings. diff --git a/content/manuals/docker-hub/repos/manage/builds/setup.md b/content/manuals/docker-hub/repos/manage/builds/setup.md index 34e12314e87f..38a97f360eba 100644 --- a/content/manuals/docker-hub/repos/manage/builds/setup.md +++ b/content/manuals/docker-hub/repos/manage/builds/setup.md @@ -22,7 +22,7 @@ build an image each time you push new code to your source provider. If you have [automated tests](automated-testing.md) configured, the new image is only pushed when the tests succeed. -1. From the **Repositories** section, select a repository to view its details. +1. In [Docker Hub](https://hub.docker.com), go to **My Hub** > **Repositories**, and select a repository to view its details. 2. Select the **Builds** tab. @@ -150,7 +150,7 @@ destination Docker tag to set up an automated build. You can also: create dynamic tags All of these options are available from the **Build configuration** screen for -each repository. Select **Repositories** from the left navigation, and select the name of the repository you want to edit. Select the **Builds** tab, and then select **Configure Automated builds**. +each repository. In [Docker Hub](https://hub.docker.com), select **My Hub** > **Repositories**, and select the name of the repository you want to edit. Select the **Builds** tab, and then select **Configure Automated builds**. ### Tag and branch builds diff --git a/content/manuals/docker-hub/repos/manage/hub-images/manage.md b/content/manuals/docker-hub/repos/manage/hub-images/manage.md index 5cb89a9222fe..7af6b2f21d90 100644 --- a/content/manuals/docker-hub/repos/manage/hub-images/manage.md +++ b/content/manuals/docker-hub/repos/manage/hub-images/manage.md @@ -27,7 +27,7 @@ The following objects are shown in the diagram. ## Manage repository images and image indexes 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. 3. In the list, select a repository. 4. Select **Image Management**. 5. Search, filter, or sort the items. diff --git a/content/manuals/docker-hub/repos/manage/hub-images/move.md b/content/manuals/docker-hub/repos/manage/hub-images/move.md index fc267f3a8e62..aa1ebd6273ba 100644 --- a/content/manuals/docker-hub/repos/manage/hub-images/move.md +++ b/content/manuals/docker-hub/repos/manage/hub-images/move.md @@ -42,7 +42,7 @@ The private images that existed in your previous account are now available in yo To avoid losing your private images, you can pull your private images from your personal account and push them to an organization that's owned by you. -1. Navigate to [Docker Hub](https://hub.docker.com) and select **Organizations**. +1. Navigate to [Docker Hub](https://hub.docker.com) and select **My Hub**. 2. Select the applicable organization and verify that your user account is a member of the organization. 3. Sign in to [Docker Hub](https://hub.docker.com) using your original Docker account, and pull your images: diff --git a/content/manuals/docker-hub/repos/manage/hub-images/tags.md b/content/manuals/docker-hub/repos/manage/hub-images/tags.md index 35db6a1866a8..6768ce9d782b 100644 --- a/content/manuals/docker-hub/repos/manage/hub-images/tags.md +++ b/content/manuals/docker-hub/repos/manage/hub-images/tags.md @@ -33,7 +33,7 @@ The image is then uploaded and available for use in Docker Hub. You can view the available tags and the size of the associated image. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -51,7 +51,7 @@ Only the repository owner or other team members with granted permissions can delete tags. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. diff --git a/content/manuals/docker-hub/repos/manage/information.md b/content/manuals/docker-hub/repos/manage/information.md index 2a163583690c..8be904423ef3 100644 --- a/content/manuals/docker-hub/repos/manage/information.md +++ b/content/manuals/docker-hub/repos/manage/information.md @@ -46,7 +46,7 @@ effective in search results, driving more relevant traffic to your repository. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -86,7 +86,7 @@ Consider the following repository overview best practices. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -142,7 +142,7 @@ You can tag a repository with up to three categories. To edit the categories of a repository: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. diff --git a/content/manuals/docker-hub/repos/manage/trusted-content/insights-analytics.md b/content/manuals/docker-hub/repos/manage/trusted-content/insights-analytics.md index 0ffd17abcb5c..4adf8b19bbfb 100644 --- a/content/manuals/docker-hub/repos/manage/trusted-content/insights-analytics.md +++ b/content/manuals/docker-hub/repos/manage/trusted-content/insights-analytics.md @@ -72,9 +72,9 @@ can analyze it manually as a spreadsheet. Export usage data for your organization's images using the Docker Hub website by following these steps: -1. Sign in to [Docker Hub](https://hub.docker.com/) and select **Organizations**. +1. Sign in to [Docker Hub](https://hub.docker.com/) and select **My Hub**. -2. Choose your organization and select **Insights and analytics**. +2. Choose your organization and select **Analytics**. ![Organization overview page, with the Insights and Analytics tab](../../../images/organization-tabs.png) diff --git a/content/manuals/docker-hub/repos/manage/vulnerability-scanning.md b/content/manuals/docker-hub/repos/manage/vulnerability-scanning.md index e9d14d3c8921..9a21813daa46 100644 --- a/content/manuals/docker-hub/repos/manage/vulnerability-scanning.md +++ b/content/manuals/docker-hub/repos/manage/vulnerability-scanning.md @@ -26,7 +26,7 @@ see [Docker Scout](/manuals/scout/_index.md). ### Turn on Docker Scout image analysis 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -41,7 +41,7 @@ see [Docker Scout](/manuals/scout/_index.md). ### Turn off Docker Scout image analysis 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -108,7 +108,7 @@ To enable static vulnerability scanning: > architecture, Linux OS, and are less than 10 GB in size. 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -130,7 +130,7 @@ repository for which you have turned on scanning. To view the vulnerability report: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. @@ -191,7 +191,7 @@ Repository owners and administrators can disable static vulnerability scanning on a repository. To disable scanning: 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. +2. Select **My Hub** > **Repositories**. A list of your repositories appears. diff --git a/content/manuals/docker-hub/repos/settings.md b/content/manuals/docker-hub/repos/settings.md index 279295d458fb..3b0f917d1eb3 100644 --- a/content/manuals/docker-hub/repos/settings.md +++ b/content/manuals/docker-hub/repos/settings.md @@ -22,9 +22,8 @@ creates the repository with your default repository privacy. ### Configure default repository privacy 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. -3. Near the top-right corner, select the settings icon and then **Repository Settings**. -4. Select the **Default privacy** for any new repository created. +2. Select **My Hub** > **Settings** > **Default privacy**. +3. Select the **Default privacy** for any new repository created. - **Public**: All new repositories appear in Docker Hub search results and can be pulled by everyone. @@ -33,7 +32,7 @@ creates the repository with your default repository privacy. repository is created in an organization's namespace, then the repository is accessible to those with applicable roles or permissions. -5. Select **Save**. +4. Select **Save**. ## Autobuild notifications @@ -43,13 +42,11 @@ autobuilds. ### Configure autobuild notifications 1. Sign in to [Docker Hub](https://hub.docker.com). -2. Select **Repositories**. -3. Near the top-right corner, select the settings icon and then **Repository Settings**. -4. Select the **Notifications** -5. Select the notifications to receive by email. +2. Select **My Hub** > **Repositories** > **Settings** > **Notifications**. +3. Select the notifications to receive by email. - **Off**: No notifications. - **Only failures**: Only notifications about failed builds. - **Everything**: Notifications for successful and failed builds. -6. Select **Save**. +4. Select **Save**. diff --git a/content/manuals/security/for-admins/single-sign-on/configure.md b/content/manuals/security/for-admins/single-sign-on/configure.md index d7ebf0c0d248..df1b0a88a1d9 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -32,7 +32,7 @@ Get started creating a single sign-on (SSO) connection for your organization or {{< tab name="Docker Hub" >}} 1. Sign in to [Docker Hub](https://hub.docker.com/). -2. Select **Organizations** and then your organization from the list. +2. Select **My Hub** and then your organization from the list. 3. On your organization page, select **Settings** and then **Security**. 4. Select **Add a domain**. 5. Enter your domain in the text box and select **Add domain**. diff --git a/content/manuals/security/for-admins/single-sign-on/connect.md b/content/manuals/security/for-admins/single-sign-on/connect.md index 188e51fe701c..a284c236122c 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -44,7 +44,7 @@ Make sure you have completed the following before you begin: {{< tab name="Docker Hub" >}} 1. Sign in to Docker Hub. -2. Select **Organizations** and then your organization from the list. +2. Select **My Hub** and then your organization from the list. 3. On your organization page, select **Settings** and then **Security**. 4. In the SSO connection table, select **Create Connection** and provide a name for the connection. 5. Select an authentication method, **SAML** or **Azure AD (OIDC)**. diff --git a/layouts/shortcodes/admin-domain-audit.md b/layouts/shortcodes/admin-domain-audit.md index ff543554745f..09a693849550 100644 --- a/layouts/shortcodes/admin-domain-audit.md +++ b/layouts/shortcodes/admin-domain-audit.md @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $domain_navigation := "Select **Organizations**, your organization, **Settings**, and then **Security**." }} +{{ $domain_navigation := "Select **My Hub**, your organization, **Settings**, and then **Security**." }} {{ $sso_link := "[SSO](/security/for-admins/single-sign-on/)" }} {{ $scim_link := "[SCIM](/security/for-admins/provisioning/scim/)" }} diff --git a/layouts/shortcodes/admin-domains.html b/layouts/shortcodes/admin-domains.html index 4ac09e18d85c..f3374f4c32d9 100644 --- a/layouts/shortcodes/admin-domains.html +++ b/layouts/shortcodes/admin-domains.html @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $domain_navigation := `Navigate to the domain settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }} +{{ $domain_navigation := `Navigate to the domain settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} diff --git a/layouts/shortcodes/admin-image-access.html b/layouts/shortcodes/admin-image-access.html index 0db9b8f4007a..a6d03ad3f5a6 100644 --- a/layouts/shortcodes/admin-image-access.html +++ b/layouts/shortcodes/admin-image-access.html @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $iam_navigation := "Select **Organizations**, your organization, **Settings**, and then select **Image Access**." }} +{{ $iam_navigation := "Select **My Hub**, select your organization in the left navigation drop-down menu, and then select **Image access**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} diff --git a/layouts/shortcodes/admin-org-audit-log.html b/layouts/shortcodes/admin-org-audit-log.html index b972f45d0a03..eaed5a993371 100644 --- a/layouts/shortcodes/admin-org-audit-log.html +++ b/layouts/shortcodes/admin-org-audit-log.html @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $audit_navigation := "Select **Organizations**, your organization, and then **Activity**." }} +{{ $audit_navigation := "Select **My Hub**, your organization, and then **Activity**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} {{ $audit_navigation = "Select your organization in the left navigation drop-down menu, and then select **Activity logs**." }} diff --git a/layouts/shortcodes/admin-registry-access.html b/layouts/shortcodes/admin-registry-access.html index 9f599753ec69..9c2276b1efa6 100644 --- a/layouts/shortcodes/admin-registry-access.html +++ b/layouts/shortcodes/admin-registry-access.html @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $ram_navigation := "Select **Organizations**, your organization, **Settings**, and then select **Registry Access**." }} +{{ $ram_navigation := "Select **My Hub**, your organization, **Settings**, and then select **Registry Access**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} {{ $ram_navigation = "Select your organization in the left navigation drop-down menu, and then select **Registry access**." }} diff --git a/layouts/shortcodes/admin-scim-disable.html b/layouts/shortcodes/admin-scim-disable.html index 8a6a23fc8d83..ea4d9cd476ad 100644 --- a/layouts/shortcodes/admin-scim-disable.html +++ b/layouts/shortcodes/admin-scim-disable.html @@ -1,7 +1,6 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := `Navigate to the SSO settings page for your organization or company. - - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**. - - Company: Select **Organizations**, your company, and then **Settings**.` }} +{{ $sso_navigation := `Navigate to the SSO settings page for your organization. + - Organization: Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} diff --git a/layouts/shortcodes/admin-scim.html b/layouts/shortcodes/admin-scim.html index 92f58cd2946f..48300d8ff3de 100644 --- a/layouts/shortcodes/admin-scim.html +++ b/layouts/shortcodes/admin-scim.html @@ -1,7 +1,6 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := `Navigate to the SSO settings page for your organization or company. - - Organization: Select **Organizations**, your organization, **Settings**, and then **Security**. - - Company: Select **Organizations**, your company, and then **Settings**.` }} +{{ $sso_navigation := `Navigate to the SSO settings page for your organization. + - Organization: Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} diff --git a/layouts/shortcodes/admin-sso-config.md b/layouts/shortcodes/admin-sso-config.md index 3a4a0d38b6f4..7f205e74bffe 100644 --- a/layouts/shortcodes/admin-sso-config.md +++ b/layouts/shortcodes/admin-sso-config.md @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }} +{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} diff --git a/layouts/shortcodes/admin-sso-connect.md b/layouts/shortcodes/admin-sso-connect.md index 4e045bd904fe..89ab466a2562 100644 --- a/layouts/shortcodes/admin-sso-connect.md +++ b/layouts/shortcodes/admin-sso-connect.md @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }} +{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} diff --git a/layouts/shortcodes/admin-sso-management-connections.md b/layouts/shortcodes/admin-sso-management-connections.md index ab51525e9949..a8759c363284 100644 --- a/layouts/shortcodes/admin-sso-management-connections.md +++ b/layouts/shortcodes/admin-sso-management-connections.md @@ -1,9 +1,9 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }} +{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company from the Choose proifle page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} + {{ $sso_navigation = "Select your organization or company from the Choose profile page, and then select **SSO and SCIM**. Note that when an organization is part of a company, you must select the company and configure SSO for that organization at the company level. Each organization can have its own SSO configuration and domain, but it must be configured at the company level." }} {{ end }} ### Edit a connection diff --git a/layouts/shortcodes/admin-sso-management-orgs.md b/layouts/shortcodes/admin-sso-management-orgs.md index 300c35911082..12406a00f418 100644 --- a/layouts/shortcodes/admin-sso-management-orgs.md +++ b/layouts/shortcodes/admin-sso-management-orgs.md @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := "Select **Organizations**, your company, and then **Settings**." }} +{{ $sso_navigation := "Select **My Hub**, your organization, and then **Settings**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} {{ $sso_navigation = "Select your company from the **Choose profile** page, and then select **SSO and SCIM**." }} diff --git a/layouts/shortcodes/admin-sso-management.md b/layouts/shortcodes/admin-sso-management.md index 054c8419a95e..9a02a6360317 100644 --- a/layouts/shortcodes/admin-sso-management.md +++ b/layouts/shortcodes/admin-sso-management.md @@ -1,5 +1,5 @@ {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **Organizations**, your organization, **Settings**, and then **Security**.` }} +{{ $sso_navigation := `Navigate to the SSO settings page for your organization. Select **My Hub**, your organization, **Settings**, and then **Security**.` }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} diff --git a/layouts/shortcodes/admin-users.html b/layouts/shortcodes/admin-users.html index 99e2c1ad0cde..f305201c23d2 100644 --- a/layouts/shortcodes/admin-users.html +++ b/layouts/shortcodes/admin-users.html @@ -1,6 +1,6 @@ {{ $invite_button := "**Invite members**" }} {{ $export_button := "**Export members**" }} -{{ $member_navigation := "Select **Organizations**, your organization, and then **Members**." }} +{{ $member_navigation := "Select **My Hub**, your organization, and then **Members**." }} {{ $remove_button := "**Remove member**" }} {{ $product_link := "[Docker Hub](https://hub.docker.com)" }} {{ $role_mapping_link := "[SCIM for role mapping](/security/for-admins/provisioning/scim/)" }}