diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index 1985a8a3182d..8639c5c43c58 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -18,7 +18,7 @@ Before deactivating your Docker account, ensure you meet the following requireme - For owners, you must leave your organization or company before deactivating your Docker account. To do this: 1. Sign in to the [Docker Admin Console](https://app.docker.com/admin). - 2. Select the organization you need to leave from the top-left drop-down menu. + 2. Select the organization you need to leave from the **Choose profile** page. 3. Find your username in the **Members** tab. 4. Select the **More options** menu and then select **Leave organization**. diff --git a/content/manuals/admin/company/organizations.md b/content/manuals/admin/company/organizations.md index 54e1ffe50a4a..d1990cd79c93 100644 --- a/content/manuals/admin/company/organizations.md +++ b/content/manuals/admin/company/organizations.md @@ -11,7 +11,7 @@ You can manage the organizations in a company in the Docker Admin Console. ## View all organizations 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Under **Organizations**, select **Overview**. ## Add seats to an organization @@ -19,7 +19,7 @@ You can manage the organizations in a company in the Docker Admin Console. When you have a [self-serve](../../subscription/details.md#self-serve) subscription that has no pending subscription changes, you can add seats using the following steps. 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Under **Organizations**, select **Overview**. 4. Select the action icon in the organization's card, and then select **Get more seats**. @@ -36,7 +36,7 @@ There is no limit to the number of organizations you can have under a company la > Once you add an organization to a company, you can't remove it from the company. 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Select **Add organization**. 4. Choose the organization you want to add from the drop-down menu. 5. Select **Add organization** to confirm. @@ -44,7 +44,7 @@ There is no limit to the number of organizations you can have under a company la ## Manage an organization 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Select the organization that you want to manage. For more details about managing an organization, see [Organization administration](../organization/_index.md). diff --git a/content/manuals/admin/company/owners.md b/content/manuals/admin/company/owners.md index fdacaa77c8f1..ba028a727aad 100644 --- a/content/manuals/admin/company/owners.md +++ b/content/manuals/admin/company/owners.md @@ -18,7 +18,7 @@ member in an organization, they don't occupy a seat. ## Add a company owner 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Select **Company owners**. 4. Select **Add owner**. 5. Specify the user's Docker ID to search for the user. @@ -27,7 +27,7 @@ member in an organization, they don't occupy a seat. ## Remove a company owner 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your company in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Select **Company owners**. 4. Select the **Action** icon in the row of the company owner that your want to remove. 5. Select **Remove as company owner**. diff --git a/content/manuals/admin/organization/general-settings.md b/content/manuals/admin/organization/general-settings.md index 9b26bc8b0ef4..9b5eb7d31e08 100644 --- a/content/manuals/admin/organization/general-settings.md +++ b/content/manuals/admin/organization/general-settings.md @@ -23,7 +23,7 @@ This information includes: To edit this information: 1. Sign in to the [Admin Console](https://admin.docker.com). -2. In the left navigation, select your organization in the drop-down menu. +2. Select your company on the **Choose profile** page. 3. Under **Organization settings**, select **General**. 4. Specify the organization information and select **Save**. diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index 5b63d23cf5ab..159a5020ea04 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -28,8 +28,7 @@ Key benefits include: 1. Go to the [Admin Console](https://app.docker.com/admin/) and sign in to an account that is an organization owner. -2. In the Admin Console, select your organization from the drop-down in the left - navigation. +2. Select your company on the **Choose profile** page. 3. Select **Insights**. 4. On the **Insights** page, select the period of time for the data. diff --git a/content/manuals/admin/organization/members.md b/content/manuals/admin/organization/members.md index 25d78ce890a4..6042f7d34374 100644 --- a/content/manuals/admin/organization/members.md +++ b/content/manuals/admin/organization/members.md @@ -70,8 +70,7 @@ To resend an invitation from Docker Hub: To resend an invitation from the Admin Console: -1. Open the [Admin Console](https://app.docker.com/admin) and select your organization from -top-left drop-down menu. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. 2. Select **Members**. 3. Select the **action menu** next to the invitee and select **Resend invitation**. 4. Select **Invite** to confirm. @@ -98,8 +97,7 @@ To remove a member's invitation from Docker Hub: To remove an invitation from the Admin Console: -1. Open the [Admin Console](https://app.docker.com/admin) and select your organization from -top-left drop-down menu. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. 2. Select **Members**. 3. Select the **action menu** next to the invitee and select **Remove invitee**. 4. Select **Remove** to confirm. diff --git a/content/manuals/desktop/features/wsl/_index.md b/content/manuals/desktop/features/wsl/_index.md index 0d53cb15d4aa..882ae9bc065f 100644 --- a/content/manuals/desktop/features/wsl/_index.md +++ b/content/manuals/desktop/features/wsl/_index.md @@ -90,6 +90,7 @@ Docker Desktop does not require any particular Linux distributions to be install ```console $ wsl --set-default ``` + If **WSL integrations** isn't available under **Resources**, Docker may be in Windows container mode. In your taskbar, select the Docker menu and then **Switch to Linux containers**. 3. Select **Apply & Restart**. diff --git a/content/manuals/desktop/images/dashboard.webp b/content/manuals/desktop/images/dashboard.webp index e76911ae84b6..ac3346c820ca 100644 Binary files a/content/manuals/desktop/images/dashboard.webp and b/content/manuals/desktop/images/dashboard.webp differ diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 7d029ae60737..e905db733007 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -23,6 +23,49 @@ Docker Desktop versions older than 6 months from the latest release are not avai Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projects/51/views/1?filterQuery=) to see what's coming next. +## 4.37.0 + +{{< release-date date="2024-12-12" >}} + +{{< desktop-install-v2 all=true beta_win_arm=true version="4.37.0" build_path="/178034/" >}} + +### New + +- You can now perform key operations such as starting, stopping, restarting, and checking the status of Docker Desktop directly from the command line. +- The AI Catalog in Docker Hub is available directly through Docker Desktop. + +### Upgrades + +- [Docker Buildx v0.19.2](https://github.com/docker/buildx/releases/tag/v0.19.2) +- [Docker Compose v2.31.0](https://github.com/docker/compose/releases/tag/v2.31.0) +- [Docker Engine v27.4.0](https://docs.docker.com/engine/release-notes/27/#2740) +- [Docker Scout CLI v1.15.1](https://github.com/docker/scout-cli/releases/tag/v1.15.1) +- [NVIDIA Container Toolkit v1.17.2](https://github.com/NVIDIA/nvidia-container-toolkit/releases/tag/v1.17.2) + +### Bug fixes and enhancements + +#### For all platforms + +- The default disk usage limit for Docker Engine in new installations is now 1TB. +- Fixed an issue where containers could not establish loopback `AF_VSOCK` connections. +- Fixed a bug where resetting default settings would also reset the CLI context. +- Fixed a bug where the Docker Desktop Dashboard would get out of sync with the Docker daemon after restarting the engine while in Resource Saver mode (Windows with WSL2 backend only) or after switching engines (macOS). +- Fixed a bug where Resource Saver mode would fail to re-engage after restarting the engine while in Resource Saver mode. + +#### For Mac + +- Fixed a bug that would create certain user directories with root permission when running the uninstaller binary twice with `sudo`. +- Fixed a bug where the in-app update would fail if Docker Desktop was installed by a non-admin user or if the current user was previously an administrator. Fixes [docker/for-mac#7403](https://github.com/docker/for-mac/issues/7403) and [docker/for-mac#6920](https://github.com/docker/for-mac/issues/6920). + +#### For Windows + +- Added support for Windows on ARM using WSL 2 version 2.3.24 and later to single distribution mode on WSL 2. +- Fixed an issue where Docker Desktop would fail to start. Fixes [docker/for-win#14453](https://github.com/docker/for-win/issues/14453) + +### Known issues + +- Kubernetes cluster may not start if **Registry Access Manager** is enabled. As a workaround, add `registry.k8s.io` and `-docker.pkg.dev` to **Registry Access Management** policies. + ## 4.36.0 {{< release-date date="2024-11-18" >}} diff --git a/content/manuals/desktop/use-desktop/_index.md b/content/manuals/desktop/use-desktop/_index.md index 70d13dcf2251..b7b309cf6b19 100644 --- a/content/manuals/desktop/use-desktop/_index.md +++ b/content/manuals/desktop/use-desktop/_index.md @@ -20,7 +20,7 @@ The **Volumes** view displays a list of volumes and allows you to easily create The **Builds** view lets you inspect your build history and manage builders. By default, it displays a list of all your ongoing and completed builds. [Explore builds](builds.md). -In addition, the Docker Desktop Dashboard let you: +In addition, the Docker Desktop Dashboard lets you: - Navigate to the **Settings** menu to configure your Docker Desktop settings. Select the **Settings** icon in the Dashboard header. - Access the **Troubleshoot** menu to debug and perform restart operations. Select the **Troubleshoot** icon in the Dashboard header. @@ -30,6 +30,8 @@ In addition, the Docker Desktop Dashboard let you: For a more detailed guide about getting started, see [Get started](/get-started/introduction/_index.md). - Get to the [Docker Scout](../../scout/_index.md) dashboard. - Check the status of Docker services. +- Access [Docker Hub](/manuals/docker-hub/_index.md) to search, browse, pull, run, or view details + of images. ## Quick search diff --git a/content/manuals/desktop/use-desktop/images.md b/content/manuals/desktop/use-desktop/images.md index 7fbfe2c0c98a..c44b7b477d8f 100644 --- a/content/manuals/desktop/use-desktop/images.md +++ b/content/manuals/desktop/use-desktop/images.md @@ -87,10 +87,10 @@ To remove individual images, select the bin icon. The **Images** view also allows you to manage and interact with images in Docker Hub repositories. By default, when you go to **Images** in Docker Desktop, you see a list of images that exist in your local image store. -The **Local** and **Hub** tabs near the top toggles between viewing images in your local image store, +The **Local** and **Hub repositories** tabs near the top toggles between viewing images in your local image store, and images in remote Docker Hub repositories that you have access to. -Switching to the **Hub** tab prompts you to sign in to your Docker Hub account, if you're not already signed in. +Switching to the **Hub repositories** tab prompts you to sign in to your Docker Hub account, if you're not already signed in. When signed in, it shows you a list of images in Docker Hub organizations and repositories that you have access to. Select an organization from the drop-down to view a list of repositories for that organization. diff --git a/content/manuals/docker-hub/quickstart.md b/content/manuals/docker-hub/quickstart.md index 91e3a37e374b..6d1f1d29fd0e 100644 --- a/content/manuals/docker-hub/quickstart.md +++ b/content/manuals/docker-hub/quickstart.md @@ -22,14 +22,16 @@ through creating a custom image and sharing it through Docker Hub. ## Step 1: Find an image in Docker Hub's library You can search for content in Docker Hub itself, in the Docker Desktop -Dashboard, or by using the `docker search` CLI command. Searching on Docker Hub -itself offers the most options to explore content. +Dashboard, or by using the CLI. To search or browse for content on Docker Hub: +{{< tabs >}} +{{< tab name="Docker Hub" >}} + 1. Navigate to the [Docker Hub Explore page](https://hub.docker.com/explore). - On the Explore page, you can browse by catalog or category, or use the search + On the **Explore** page, you can browse by catalog or category, or use the search to quickly find content. 2. Under **Categories**, select **Web servers**. @@ -48,11 +50,88 @@ To search or browse for content on Docker Hub: to use the image. On the page, you'll also find the `docker pull` command to pull the image. +{{< /tab >}} +{{< tab name="Docker Desktop" >}} + +1. Open the Docker Desktop Dashboard. +2. Select the **Docker Hub** view. + + In the **Docker Hub** view, you can browse by catalog or category, or use the search + to quickly find content. + +3. Leave the search box empty and then select **Search**. + + The search results are shown with additional filters now next to the search box. + +4. Select the search filter icon, and then select **Docker Official Image** and **Web Servers**. +5. In the results, select the **nginx** image. + +{{< /tab >}} +{{< tab name="CLI" >}} + +1. Open a terminal window. + + > [!TIP] + > + > The Docker Desktop Dashboard contains a built-in terminal. At the bottom of + > the Dashboard, select **>_ Terminal** to open it. + +2. In the terminal, run the following command. + + ```console + $ docker search --filter is-official=true nginx + ``` + + Unlike the Docker Hub and Docker Desktop interfaces, you can't browse by + category using the `docker search` command. For more details about the + command, see [docker search](/reference/cli/docker/search/). + +{{< /tab >}} +{{< /tabs >}} + Now that you've found an image, it's time to pull and run it on your device. ## Step 2: Pull and run an image from Docker Hub -1. In your terminal, run the following command to pull and run the Nginx image. +You can run images from Docker Hub using the CLI or Docker Desktop Dashboard. + +{{< tabs >}} +{{< tab name="Docker Desktop" >}} + +1. In the Docker Desktop Dashboard, select the **nginx** image in the **Docker + Hub** view. For more details, see [Step 1: Find an image in Docker Hub's + library](#step-1-find-an-image-in-docker-hubs-library). + +2. On the **nginx** screen, select **Run**. + + If the image doesn't exist on your device, it is automatically pulled from + Docker Hub. Pulling the image may take a few seconds or minutes depending on + your connection. After the image has been pulled, a window appears in Docker + Desktop and you can specify run options. + +3. In the **Host port** option, specify `8080`. +4. Select **Run**. + + The container logs appear after the container starts. + +5. Select the **8080:80** link to open the server, or visit + [https://localhost:8080](https://localhost:8080) in your web browser. + +6. In the Docker Desktop Dashboard, select the **Stop** button to stop the + container. + + +{{< /tab >}} +{{< tab name="CLI" >}} + +1. Open a terminal window. + + > [!TIP] + > + > The Docker Desktop Dashboard contains a built-in terminal. At the bottom of + > the Dashboard, select **>_ Terminal** to open it. + +2. In your terminal, run the following command to pull and run the Nginx image. ```console $ docker run -p 8080:80 --rm nginx @@ -95,22 +174,26 @@ Now that you've found an image, it's time to pull and run it on your device. ... ``` -2. Visit [https://localhost:8080](https://localhost:8080) to view the default +3. Visit [https://localhost:8080](https://localhost:8080) to view the default Nginx page and verify that the container is running. -3. In the terminal, press CTRL+C to stop the container. +4. In the terminal, press Ctrl+C to stop the container. -You've now run a web server without any set up or configuration, all from a -single command. Docker Hub provides instant access to pre-built, ready-to-use -container images, letting you quickly pull and run applications without needing -to install or configure software manually. With Docker Hub's vast library of -images, you can experiment with and deploy applications effortlessly, boosting -productivity and making it easy to try out new tools, set up development -environments, or build on top of existing software. +{{< /tab >}} +{{< /tabs >}} + +You've now run a web server without any set up or configuration. Docker Hub +provides instant access to pre-built, ready-to-use container images, letting you +quickly pull and run applications without needing to install or configure +software manually. With Docker Hub's vast library of images, you can experiment +with and deploy applications effortlessly, boosting productivity and making it +easy to try out new tools, set up development environments, or build on top of +existing software. You can also extend images from Docker Hub, letting you quickly build and customize your own images to suit specific needs. + ## Step 3: Build and push an image to Docker Hub 1. Create a [Dockerfile](/reference/dockerfile.md) to specify your application: @@ -201,6 +284,11 @@ customize your own images to suit specific needs. ## Step 4: View your repository on Docker Hub and explore options +You can view your Docker Hub repositories in the Docker Hub or Docker Desktop interface. + +{{< tabs >}} +{{< tab name="Docker Hub" >}} + 1. Go to [Docker Hub](https://hub.docker.com) and sign in. After signing in, you should be on the **Repositories** page. If not, then go @@ -211,6 +299,22 @@ customize your own images to suit specific needs. After selecting the repository, you should see more details and options for your repository. +{{< /tab >}} +{{< tab name="Docker Desktop" >}} + +1. Sign in to Docker Desktop. +2. Select the **Images** view. +3. Select the **Hub repositories** tab. + + A list of your Docker Hub repositories appears. + +4. Find the **nginx-custom** repository, hover over the row, and then select **View in Hub**. + + Docker Hub opens and you are able to view more details about the image. + +{{< /tab >}} +{{< /tabs >}} + You've now verified that your repository exists on Docker Hub, and you've discovered more options for it. View the next steps to learn more about some of these options. diff --git a/content/manuals/harmonia/_index.md b/content/manuals/harmonia/_index.md index ba987542bc84..b3a6b88d5f45 100644 --- a/content/manuals/harmonia/_index.md +++ b/content/manuals/harmonia/_index.md @@ -263,7 +263,9 @@ Run `docker harmonia doctor` to print helpful troubleshooting information. - KinD does not run on Project Harmonia due to some hard-coded assumptions to ensure it's running in a privileged container. K3d is a good alternative. - Containers cannot access host through DNS `host.docker.internal`. - File binds (non-directory binds) are currently static, meaning changes will not be reflected until the container is restarted. This also affects Compose configs and secrets directives. -- Bind mounts, such as `-v /localpath:/incontainer` in the `docker run` command, are not supported without using a file-sync. +- Bind _mounts_, such as `-v /localpath:/incontainer` in the `docker run` command, require creating a file-sync. +- Creating a [synchronized file share](/manuals/desktop/features/synchronized-file-sharing.md) for a directory with a large amount of may take extra time to sync and become ready for use in a container. +- Bind _volumes_, such as those created with `docker volume create --driver local --opt type=none --opt o=bind --opt device=/some/host/path myvolname` or via the compose equivalent, are not supported. - Port-forwarding for UDP is not supported. - Docker Compose projects relying on `watch` in `sync` mode are not working with the `tar` synchronizer. Configure it to use `docker cp` instead, disable tar sync by setting `COMPOSE_EXPERIMENTAL_WATCH_TAR=0` in your environment. - Some Docker Engine features that let you access the underlying host, such as `--pid=host`, `--network=host`, and `--ipc=host`, are currently disabled. diff --git a/content/manuals/security/for-admins/provisioning/just-in-time.md b/content/manuals/security/for-admins/provisioning/just-in-time.md index d412f8b6b7e8..dc006697753c 100644 --- a/content/manuals/security/for-admins/provisioning/just-in-time.md +++ b/content/manuals/security/for-admins/provisioning/just-in-time.md @@ -63,7 +63,7 @@ You may want to disable JIT provisioning for reasons such as the following: Users are provisioned with JIT by default. If you enable SCIM, you can disable JIT: -1. Sign in to the [Admin Console](https://app.docker.com/). -2. Select your organization or company in the left-hand navigation drop-down, and then select **SSO and SCIM**. +1. In the [Admin Console](https://app.docker.com/admin), select your organization. +2. Select **SSO and SCIM**. 3. In the SSO connections table, select the **Action** icon and then **Disable JIT provisioning**. 4. Select **Disable** to confirm. 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 a5bda5c29b55..ee2905fbc064 100644 --- a/content/manuals/security/for-admins/single-sign-on/configure.md +++ b/content/manuals/security/for-admins/single-sign-on/configure.md @@ -22,7 +22,7 @@ Get started creating a single sign-on (SSO) connection for your organization or {{< include "admin-early-access.md" >}} 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the left-hand drop-down menu. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under **Security and access**, select **Domain management**. 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 1c95c487975a..0a698b9653a9 100644 --- a/content/manuals/security/for-admins/single-sign-on/connect.md +++ b/content/manuals/security/for-admins/single-sign-on/connect.md @@ -31,7 +31,7 @@ Make sure you have completed the following before you begin: {{< include "admin-early-access.md" >}} 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the left-hand drop-down menu. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 4. Select **Create Connection** and provide a name for the connection. 5. Select an authentication method, **SAML** or **Azure AD (OIDC)**. @@ -201,7 +201,7 @@ You can also test your SSO connection through the command-line interface (CLI). Enforcing SSO requires users to use SSO when signing into Docker. This centralizes authentication and enforces policies set by the IdP. 1. Sign in to the [Admin Console](https://admin.docker.com/). -2. Select your organization or company from the left-hand drop-down menu. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. +2. Select your organization or company from the **Choose profile** page. Note that when an organization is part of a company, you must select the company and configure the domain for the organization at the company level. 3. Under Security and access, select **SSO and SCIM**. 4. In the SSO connections table, select the **Action** icon and then **Enable enforcement**. When SSO is enforced, your users are unable to modify their email address and password, convert a user account to an organization, or set up 2FA through Docker Hub. If you want to use 2FA, you must enable 2FA through your IdP. 5. Continue with the on-screen instructions and verify you've completed all tasks. diff --git a/content/manuals/security/for-admins/single-sign-on/manage.md b/content/manuals/security/for-admins/single-sign-on/manage.md index 26455b24794f..70b4af79abe0 100644 --- a/content/manuals/security/for-admins/single-sign-on/manage.md +++ b/content/manuals/security/for-admins/single-sign-on/manage.md @@ -71,7 +71,7 @@ aliases: To add a guest that isn't verified through your IdP: 1. Sign in to the [Admin Console](https://app.docker.com/admin). -2. Select **Organizations**, your organization, and then **Members**. +2. Select your organization or company from the **Choose profile** page, then select **Members**. 3. Select **Invite**. 4. Follow the on-screen instructions to invite the user. @@ -80,7 +80,7 @@ To add a guest that isn't verified through your IdP: To remove a user: 1. Sign in to [Admin Console](https://app.docker.com/admin). -2. Select **Organizations**, your organization, and then **Members**. +2. Select your organization or company from the **Choose profile** page, then select **Members**. 3. Select the action icon next to a user’s name, and then select **Remove member**, if you're an organization, or **Remove user**, if you're a company. 4. Follow the on-screen instructions to remove the user. diff --git a/content/manuals/security/for-admins/single-sign-on/troubleshoot.md b/content/manuals/security/for-admins/single-sign-on/troubleshoot.md index 651bf9d8e379..e5585e36a8a7 100644 --- a/content/manuals/security/for-admins/single-sign-on/troubleshoot.md +++ b/content/manuals/security/for-admins/single-sign-on/troubleshoot.md @@ -16,8 +16,7 @@ their service. ## View SSO and SCIM error logs 1. Sign in to the [Admin Console](https://app.docker.com/admin/). -2. Select your organization or company in the left navigation drop-down menu, - and then select **SSO and SCIM**. +2. Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**. > [!NOTE] > diff --git a/layouts/shortcodes/admin-domain-audit.md b/layouts/shortcodes/admin-domain-audit.md index d43dd82c75e9..983555f834f8 100644 --- a/layouts/shortcodes/admin-domain-audit.md +++ b/layouts/shortcodes/admin-domain-audit.md @@ -5,7 +5,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $domain_navigation = "Select your organization in the left navigation drop-down menu, and then select **Domain management**." }} + {{ $domain_navigation = "Select your organization on the **Choose profile** page, and then select **Domain management**." }} {{ $sso_link = "[SSO](/security/for-admins/single-sign-on/)" }} {{ $scim_link = "[SCIM](/security/for-admins/provisioning/scim/)" }} {{ end }} diff --git a/layouts/shortcodes/admin-sso-config.md b/layouts/shortcodes/admin-sso-config.md index 1c959eeadc4b..3a4a0d38b6f4 100644 --- a/layouts/shortcodes/admin-sso-config.md +++ b/layouts/shortcodes/admin-sso-config.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, 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 }} > [!IMPORTANT] diff --git a/layouts/shortcodes/admin-sso-connect.md b/layouts/shortcodes/admin-sso-connect.md index e5663366a7f5..4e045bd904fe 100644 --- a/layouts/shortcodes/admin-sso-connect.md +++ b/layouts/shortcodes/admin-sso-connect.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, 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 }} 1. In {{ $product_link }}, select the verified domains you want to apply the connection to. diff --git a/layouts/shortcodes/admin-sso-management-connections.md b/layouts/shortcodes/admin-sso-management-connections.md index fe185d858186..ab51525e9949 100644 --- a/layouts/shortcodes/admin-sso-management-connections.md +++ b/layouts/shortcodes/admin-sso-management-connections.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, 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 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." }} {{ end }} ### Edit a connection diff --git a/layouts/shortcodes/admin-sso-management-orgs.md b/layouts/shortcodes/admin-sso-management-orgs.md index db97b8b12d4a..300c35911082 100644 --- a/layouts/shortcodes/admin-sso-management-orgs.md +++ b/layouts/shortcodes/admin-sso-management-orgs.md @@ -2,7 +2,7 @@ {{ $sso_navigation := "Select **Organizations**, your company, and then **Settings**." }} {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} + {{ $sso_navigation = "Select your company from the **Choose profile** page, and then select **SSO and SCIM**." }} {{ end }} ### Connect an organization diff --git a/layouts/shortcodes/admin-sso-management.md b/layouts/shortcodes/admin-sso-management.md index a61db8256c48..054c8419a95e 100644 --- a/layouts/shortcodes/admin-sso-management.md +++ b/layouts/shortcodes/admin-sso-management.md @@ -3,7 +3,7 @@ {{ if eq (.Get "product") "admin" }} {{ $product_link = "the [Admin Console](https://app.docker.com/admin)" }} - {{ $sso_navigation = "Select your organization or company in the left navigation drop-down menu, and then select **SSO and SCIM**." }} + {{ $sso_navigation = "Select your organization or company from the **Choose profile** page, and then select **SSO and SCIM**." }} {{ end }} ### Remove a domain from an SSO connection diff --git a/layouts/shortcodes/admin-users.html b/layouts/shortcodes/admin-users.html index 1594d9dfd0be..6f7bbae8c2e7 100644 --- a/layouts/shortcodes/admin-users.html +++ b/layouts/shortcodes/admin-users.html @@ -17,7 +17,7 @@ {{ if eq (.Get "product") "admin" }} {{ $invite_button = "**Invite**" }} {{ $export_button = "the **Action** icon and then select **Export users as CSV**" }} -{{ $member_navigation = "Select your organization in the left navigation drop-down menu, and then select **Members**." }} +{{ $member_navigation = "Select your organization from the **Choose profile** page, and then select **Members**." }} {{ $remove_button = "**Remove member**" }} {{ $product_link = "the [Admin Console](https://admin.docker.com)" }} {{ $role_mapping_link = "[SCIM for role mapping](/security/for-admins/provisioning/scim/)" }}