diff --git a/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md b/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md index e2b92b3e03..1eaa7b2cb7 100644 --- a/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md +++ b/content/desktop/hardened-desktop/enhanced-container-isolation/_index.md @@ -57,7 +57,7 @@ For more information on how Enhanced Container Isolation work, see [How does it >**Important** > ->Enhanced Container Isolation does not protect Kubernetes pods. For more information on known limitations and workarounds, see [FAQs and known issues](faq.md). +>Enhanced Container Isolation does not protect Kubernetes pods. For more information on known limitations and workarounds, see [FAQs](../../../faq/security/eci-faq.md). { .important } ### What host OSes / platforms is Enhanced Container Isolation supported on? @@ -85,7 +85,7 @@ To enable Enhanced Container Isolation as a developer: >**Important** > ->Enhanced Container Isolation does not protect containers created prior to enabling ECI. For more information on known limitations and workarounds, see [FAQs and known issues](faq.md). +>Enhanced Container Isolation does not protect containers created prior to enabling ECI. For more information on known limitations and workarounds, see [FAQs](../../../faq/security/eci-faq.md). { .important } #### As an admin diff --git a/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md b/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md index 00a327dc16..9aae36b084 100644 --- a/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md +++ b/content/desktop/hardened-desktop/enhanced-container-isolation/how-eci-works.md @@ -20,7 +20,7 @@ When [Enhanced Container Isolation is enabled](index.md#how-do-i-enable-enhanced created by users through `docker run` or `docker create` are automatically launched using Sysbox instead of the standard OCI runc runtime. Users need not do anything else and can continue to use containers as usual. For exceptions, -see [FAQs and known issues](faq.md). +see [FAQs](../../../faq/security/eci-faq.md). Even containers that use the insecure `--privileged` flag can now be run securely with Enhanced Container Isolation, such that they can no longer be used diff --git a/content/desktop/hardened-desktop/enhanced-container-isolation/faq.md b/content/faq/security/eci-faq.md similarity index 97% rename from content/desktop/hardened-desktop/enhanced-container-isolation/faq.md rename to content/faq/security/eci-faq.md index 9e1b077481..3e5c360811 100644 --- a/content/desktop/hardened-desktop/enhanced-container-isolation/faq.md +++ b/content/faq/security/eci-faq.md @@ -3,6 +3,8 @@ title: FAQs description: Frequently asked questions for Enhanced Container Isolation keywords: enhanced container isolation, security, faq, sysbox, Docker Desktop toc_max: 2 +aliases: +- /desktop/hardened-desktop/enhanced-container-isolation/faq/ --- ### Do I need to change the way I use Docker when Enhanced Container Isolation is switched on? diff --git a/content/faq/security/general.md b/content/faq/security/general.md new file mode 100644 index 0000000000..d3edb68637 --- /dev/null +++ b/content/faq/security/general.md @@ -0,0 +1,9 @@ +--- +description: Find the answers to common security related FAQs +keywords: Docker, Docker Hub, Docker Desktop secuirty FAQs, secuirty, platform +title: Security FAQs +--- + +## How does Docker Desktop handle and store authentication information? + +Docker Desktop utilizes the host operating system's secure key management for handling and storing authentication tokens necessary for authenticating with image registries. On macOS, this is [Keychain](https://support.apple.com/guide/security/keychain-data-protection-secb0694df1a/web); on Windows, this is [Security and Identity API via Wincred](https://learn.microsoft.com/en-us/windows/win32/api/wincred/); and on Linux, this is [Pass](https://www.passwordstore.org/). \ No newline at end of file diff --git a/content/security/_index.md b/content/security/_index.md index fa27372329..d0804cbc3a 100644 --- a/content/security/_index.md +++ b/content/security/_index.md @@ -52,6 +52,15 @@ grid_developers: description: Learn how to use secrets in Docker Compose. icon: privacy_tip link: /compose/use-secrets/ +grid_resources: +- title: Security FAQs + description: Explore common security FAQs. + icon: help + link: /faq/security/general/ +- title: Security best practices + description: Understand the steps you can take to improve the security of your container. + icon: category + link: /develop/security-best-practices/ --- Docker provides security guardrails for both administrators and developers. @@ -71,4 +80,8 @@ Explore the security features Docker offers to satisfy your company's security p See how you can protect your local environments, infrastructure, and networks without impeding productivity. -{{< grid grid_developers >}} \ No newline at end of file +{{< grid grid_developers >}} + +## Further resources + +{{< grid grid_resources >}} diff --git a/data/toc.yaml b/data/toc.yaml index 745e8e0100..f5076af324 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -1154,8 +1154,6 @@ Manuals: title: How does it work? - path: /desktop/hardened-desktop/enhanced-container-isolation/features-benefits/ title: Key features and benefits - - path: /desktop/hardened-desktop/enhanced-container-isolation/faq/ - title: FAQs and known issues - sectiontitle: Dev Environments (Beta) section: - path: /desktop/dev-environments/ @@ -2218,3 +2216,9 @@ FAQ: title: Manage users - path: /subscription/faq/ title: Subscription + - sectiontitle: Security + section: + - path: /faq/security/general/ + title: General + - path: /faq/security/eci-faq/ + title: Enhanced Container Isolation