docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hub hotjar feedback (#16761) 

* hub feedback 1

* hub feedback 2
This commit is contained in:
Allie Sadler 2023-02-23 15:56:48 +00:00 committed by GitHub
parent 4db5b7087c
commit 96636dcf75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker-hub/scim.md
View File

@ -28,9 +28,8 @@ Before you make SCIM configuration changes in your IdP, navigate to [Docker Hub]
### Okta
1. In Okta, navigate to **Applications** > **Create App Integration** > **SAML 2.0**, and **Next**.
2. In the **General** tab, on your new application page, select **Edit App Settings** to enable SCIM provisioning and **Save**.
3. In the **Provisioning** tab, edit the SCIM Connection and complete the following:
1. In Okta, navigate to your SAML or SWA Docker app integration and [add SCIM provisioning](https://help.okta.com/oie/en-us/Content/Topics/Apps/Apps_App_Integration_Wizard_SCIM.htm).
2. In the **Provisioning** tab, edit the SCIM Connection and complete the following:
* **SCIM connector base URL**: SCIM Base URL from Docker Hub
* **Unique identifier field for users**: enter **email**
@ -39,12 +38,12 @@ Before you make SCIM configuration changes in your IdP, navigate to [Docker Hub]
![SCIM app provisioning options](images/scim-app-provisioning.png){:width="700px"}
4. Click **Test Connection Configuration** to complete the configuration and **Save**.
5. Once configured, you must enable synchronization. Navigate to **Provisioning** > **To App** > **Edit**, and enable **Create Users**, **Update User Attributes** and **Deactivates Users**, and **Save**.
3. Click **Test Connection Configuration** to complete the configuration and **Save**.
4. Once configured, you must enable synchronization. Navigate to **Provisioning** > **To App** > **Edit**, and enable **Create Users**, **Update User Attributes** and **Deactivates Users**, and **Save**.
![Enable synchronization](images/provisioning-to-app.png){:width="700px"}
6. Remove all fields that aren't supported from your **Docker Hub Attributes Mappings**.
5. Remove all fields that aren't supported from your **Docker Hub Attributes Mappings**.
![Docker Hub attributes mappings view](images/scim-attributes.png){:width="700px"}

13
subscription/index.md
View File

@ -10,19 +10,6 @@ redirect_from:
On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} updates and extensions to the product subscriptions to increase productivity, collaboration, and added security for developers and businesses. Docker subscription tiers now include Personal, Pro, Team, and Business.
### Summary of the changes
- We’re introducing a new product subscription, Docker Business, for organizations using Docker at scale for application development and require features like secure software supply chain management, single sign-on (SSO), container registry access controls, and more.
- The [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} includes a change to the terms for **Docker Desktop**.
- Docker Desktop **remains free** for small businesses (fewer than 250 employees and less than $10 million in annual revenue), personal use, education, and non-commercial open-source projects.
- It requires a paid subscription (**Pro, Team, or Business**), for as little as $5 a month, for commercial use in larger enterprises.
- The Docker Pro and Docker Team subscriptions now **include commercial use** of Docker Desktop.
- The existing Docker Free subscription has been renamed **Docker Personal**.
- **No changes** to Docker Engine or any other upstream **open-source** Docker or Moby project.
To understand how these changes affect you, read the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.
The following sections provide an overview of each tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.
## Docker Personal