Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENGDOCS-2072 #19857

Closed
wants to merge 9 commits into from
Closed

ENGDOCS-2072 #19857

wants to merge 9 commits into from

Conversation

aevesdocker
Copy link
Contributor

@aevesdocker aevesdocker commented Apr 24, 2024

Description

For release with DD4.31 (maybe)

Related issues or tickets

Reviews

  • Technical review
  • Editorial review
  • Product review

@github-actions github-actions bot added area/hub Issue affects Docker Hub area/desktop Issue affects a desktop edition of Docker. E.g docker for mac area/security area/extensions Relates to Docker Extensions area/admin Relates to Docker Admin hugo Updates related to hugo labels Apr 24, 2024
Copy link

netlify bot commented Apr 24, 2024

Deploy Preview for docsdocker ready!

Name Link
🔨 Latest commit ffc89af
🔍 Latest deploy log https://app.netlify.com/sites/docsdocker/deploys/66310b5e87ade200084cddf0
😎 Deploy Preview https://deploy-preview-19857--docsdocker.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

@KatTomrushka KatTomrushka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to also replace some implementation details once https://github.com/docker/pinata/pull/28020 is merged as it changes the data structures of the registry key and the plist.

content/desktop/extensions/private-marketplace.md Outdated Show resolved Hide resolved
content/desktop/get-started.md Outdated Show resolved Hide resolved
content/security/for-admins/image-access-management.md Outdated Show resolved Hide resolved
content/security/for-admins/registry-access-management.md Outdated Show resolved Hide resolved
layouts/shortcodes/admin-org-onboarding.md Outdated Show resolved Hide resolved
@aevesdocker aevesdocker marked this pull request as ready for review April 29, 2024 09:56
@aevesdocker aevesdocker added this to the 4.30 milestone Apr 29, 2024
Copy link

@Xeeynamo Xeeynamo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few lines that needs to be adjusted to reflect some last-minute changes (apologise about that).

I also added a few suggestions/optional changes, all marked with the 💡 emoji.

I do not see a comment about supporting only one entry for the allowedOrgs, despite giving the option to put more than one value. If an admin put more than one value in allowedOrgs, the log-in enforcement will silently fail. So better make it clear.

Other than that, everything else looks brilliant. Thanks for doing this!

content/admin/faqs/organization-faqs.md Show resolved Hide resolved
content/security/for-admins/enforce-sign-in/_index.md Outdated Show resolved Hide resolved
content/security/for-admins/enforce-sign-in/methods.md Outdated Show resolved Hide resolved
content/security/for-admins/enforce-sign-in/methods.md Outdated Show resolved Hide resolved
content/security/for-admins/enforce-sign-in/methods.md Outdated Show resolved Hide resolved
content/security/for-admins/enforce-sign-in/methods.md Outdated Show resolved Hide resolved
Copy link
Contributor

@stephaurelio stephaurelio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Left a few small comments ✨

2. Within Group Policy, create or edit a Group Policy Objective (GPO) that applies to the machines or users you wish to target.
3. Within the GPO, navigate to **Computer Configuration** > **Preferences** > **Windows Settings** > **Registry**.
4. Add the registry item. Right-click on the **Registry** node, select **New** > **Registry Item**.
5. Configure the new registry item to match the registry script you created, specifying the action as **Update**. Make suer you input the correct path, value name (`allowedOrgs`), and value data (your organization’s name).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small typo:

Suggested change
5. Configure the new registry item to match the registry script you created, specifying the action as **Update**. Make suer you input the correct path, value name (`allowedOrgs`), and value data (your organization’s name).
5. Configure the new registry item to match the registry script you created, specifying the action as **Update**. Make sure you input the correct path, value name (`allowedOrgs`), and value data (your organization’s name).

1. Create a Bash script that can check for the existence of the `.plist` file in the correct directory, create or modify it as needed, and set the appropriate permissions.
Include commands in your script to:
- Navigate to the `/Library/Application Support/com.docker.docker/` directory or create it if it doesn't exist.
- Use the `defaults` command to write the required keys and values to the `desktop.plist` file. For example, `defaults write /Library/Application\ Support/com.docker.docker/desktop.plist allowedOrgs -string "myorg"`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The example defaults write... is a little long when I view the deploy preview and ends with the period on a new line. Is it work using a code block here instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oop, yes, changed!

> This means that your users must use SSO to sign in, instead of a username and password.
> When you enforce sign-in and enforce SSO, your users must sign in and must use SSO to do so.
> See [Enforce SSO](/security/for-admins/single-sign-on/connect#optional-enforce-sso) for details on how to enable this for your SSO connection.
{ .tip }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Maybe can add a "Next steps" section here linking to the Methods page?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did consider that, but have already got links to the methods page up on line 18,19,20, so wasn't sure if it would be too repetitive

@github-actions github-actions bot added the area/release Relates to CI or deployment label Apr 30, 2024
Copy link
Contributor

@stephaurelio stephaurelio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - unless you want to appease Vale some more 😅

@aevesdocker aevesdocker modified the milestones: 4.30, 4.31 May 1, 2024
Copy link

@KatTomrushka KatTomrushka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I please get the preview link so that I can share with a few customers prior to public announcement? Plan is to get the code changes in production but will announce when we are ready later on.

@aevesdocker
Copy link
Contributor Author

@KatTomrushka Preview here https://deploy-preview-19857--docsdocker.netlify.app/security/for-admins/enforce-sign-in/

@aevesdocker aevesdocker mentioned this pull request May 23, 2024
3 tasks
@aevesdocker
Copy link
Contributor Author

Closing as new PR replaces this

@aevesdocker aevesdocker closed this Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/admin Relates to Docker Admin area/desktop Issue affects a desktop edition of Docker. E.g docker for mac area/extensions Relates to Docker Extensions area/hub Issue affects Docker Hub area/release Relates to CI or deployment area/security hugo Updates related to hugo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants