From faa05b7875a8329c60276b5063ddbb7c911177f9 Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 22 Sep 2021 20:54:00 +0100 Subject: [PATCH 1/4] Add a FAQ for Desktop + Kubernetes + WSL 2 + host filesharing Signed-off-by: David Scott --- desktop/faqs.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/desktop/faqs.md b/desktop/faqs.md index 8e6fd34fc0..d2b6d16c8e 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -239,3 +239,8 @@ For workarounds and to learn more, see Docker Desktop supports two types of symlinks: Windows native symlinks and symlinks created inside a container. The Windows native symlinks are visible within the containers as symlinks, whereas symlinks created inside a container are represented as [mfsymlinks](https://wiki.samba.org/index.php/UNIX_Extensions#Minshall.2BFrench_symlinks){:target="_blank" rel="noopener" class="_"}. These are regular Windows files with a special metadata. Therefore the symlinks created inside a container appear as symlinks inside the container, but not on the host. + +### Filesharing with Kubernetes and WSL 2 + +Docker Desktop mounts the Windows host filesystem under `/run/desktop` inside the container running Kubernetes. +See [this stackoverflow post](https://stackoverflow.com/questions/67746843/clear-persistent-volume-from-a-kubernetes-cluster-running-on-docker-desktop/69273405#69273) for an example of how to configure a Kubernetes Persistent Volume to represent directories on the host. \ No newline at end of file From a8f9b373b20778929d7d0040c896e584f0684a5a Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Wed, 22 Sep 2021 14:55:01 -0500 Subject: [PATCH 2/4] revised step 4 --- docker-hub/access-tokens.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-hub/access-tokens.md b/docker-hub/access-tokens.md index 584fdae340..1a6de2f9b0 100644 --- a/docker-hub/access-tokens.md +++ b/docker-hub/access-tokens.md @@ -39,10 +39,11 @@ You can create as many tokens as you need. 4. Add a description for your token. Use something that indicates where the token will be used, or set a purpose for the token. +You can view the following access permissions from the drop-down: ![PAT Menu](images/hub-create-token.png){:width="700px"} -5. You can view the following permissions from the drop-down: +5. The table below lists the tokens available in each subscription: | Feature | Personal | Pro | Team | Business | | --------------------- | ---- | ----- | ----- |----- | @@ -53,7 +54,7 @@ the token will be used, or set a purpose for the token. >*You can create 1 access token as part of the Docker Personal tier, 5 tokens as part of Docker Pro, and Unlimited tokens as part of Docker Team and Business tier. For more information, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}. -6. Copy the token that appears on the screen and save it. You will not be able to retrieve the token once you close this prompt. +5. Copy the token that appears on the screen and save it. You will not be able to retrieve the token once you close this prompt. ![Copy Token](images/hub-copy-token.png){:width="700px"} From 6ed8c2b1335359db9992cfdd7009ef347bea206a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 23 Sep 2021 13:13:45 +0200 Subject: [PATCH 3/4] access-tokens: markdown touch-ups, and some copy edits - wrap lines to ~80 characters - indent second lines for bullets to make them look slightly more as bullet-lists (also when looking at the source) - Split the "Modify existing tokens" into three steps. Doing so, we could include the "You can also view the number of tokens that are activated and deactivated in the toolbar." note as regular text. The bullet already had 2 images _and_ a note, which made it a bit "cluttered" - Added a step to "save" the changes. It's trivial, but felt like it made the topic "finished". - Changed the mention of the "Docker Hub CLI and API" to a note, so that it's standing out a bit more, and somewhat clearer that it's not really part of the instructions. Signed-off-by: Sebastiaan van Stijn --- docker-hub/access-tokens.md | 46 +++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/docker-hub/access-tokens.md b/docker-hub/access-tokens.md index 1a6de2f9b0..210706df6e 100644 --- a/docker-hub/access-tokens.md +++ b/docker-hub/access-tokens.md @@ -4,11 +4,15 @@ description: Learn how to create and manage your personal Docker Hub access toke keywords: docker hub, hub, security, PAT, personal access token --- -Docker Hub lets you create personal access tokens as alternatives to your password. You can use tokens to access Hub images from the Docker CLI. +Docker Hub lets you create personal access tokens as alternatives to your password. +You can use tokens to access Hub images from the Docker CLI. Using personal access tokens provides some advantages over a password: -* You can investigate the last usage of the access token and disable or delete it if you find any suspicious activity. -* When using an access token, you can't perform any admin activity on the account, including changing the password. It protects your account if your computer is compromised. + +* You can investigate the last usage of the access token and disable or delete + it if you find any suspicious activity. +* When using an access token, you can't perform any admin activity on the account, + including changing the password. It protects your account if your computer is compromised. >**Important** > @@ -37,9 +41,9 @@ You can create as many tokens as you need. 3. Select **[Security](https://hub.docker.com/settings/security) > New Access Token**. -4. Add a description for your token. Use something that indicates where -the token will be used, or set a purpose for the token. -You can view the following access permissions from the drop-down: +4. Add a description for your token. Use something that indicates where the token + will be used, or set a purpose for the token. You can view the following access + permissions from the drop-down: ![PAT Menu](images/hub-create-token.png){:width="700px"} @@ -54,7 +58,8 @@ You can view the following access permissions from the drop-down: >*You can create 1 access token as part of the Docker Personal tier, 5 tokens as part of Docker Pro, and Unlimited tokens as part of Docker Team and Business tier. For more information, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}. -5. Copy the token that appears on the screen and save it. You will not be able to retrieve the token once you close this prompt. +6. Copy the token that appears on the screen and save it. You will not be able + to retrieve the token once you close this prompt. ![Copy Token](images/hub-copy-token.png){:width="700px"} @@ -63,7 +68,9 @@ You can view the following access permissions from the drop-down: You can use an access token anywhere that requires your Docker Hub password. -When logging in from your Docker CLI client (`docker login --username `), omit the password in the login command. Instead, enter your token when asked for a password. +When logging in from your Docker CLI client (`docker login --username `), +omit the password in the login command. Instead, enter your token when asked for +a password. > **Note** > @@ -76,17 +83,22 @@ When logging in from your Docker CLI client (`docker login --username You can rename, activate, deactivate, or delete a token as needed. 1. Access your tokens under **[Account Settings > Security](https://hub.docker.com/settings/security){: target="_blank" rel="noopener" class="_"}**. + This page shows an overview of all your tokens. You can also view the number + of tokens that are activated and deactivated in the toolbar. + + ![Delete or Edit](images/hub-delete-edit-token.png){:width="700px"} 2. Select a token and click **Delete** or **Edit**, or use the menu on -the far right of a token row to bring up the edit screen. You can also -select multiple tokens to delete at once. - - ![Delete or Edit](images/hub-delete-edit-token.png){:width="700px"} - - > **Note** - > - > You can also view the number of tokens that are activated and deactivated in the toolbar. + the far right of a token row to bring up the edit screen. You can also + select multiple tokens to delete at once. ![Modify Token](images/hub-edit-token.png){:width="700px"} -Docker provides a [Docker Hub CLI](https://github.com/docker/hub-tool#readme){: target="_blank" rel="noopener" class="_"} tool (currently experimental) and an API that allows you to interact with Docker Hub. Browse through the [Docker Hub API](/docker-hub/api/latest/){: target="_blank" rel="noopener" class="_"} documentation to explore the supported endpoints. +3. After modifying the token, click the **Save** button to save your changes. + +> **Tip: Docker Hub CLI and API** +> +> Docker provides a [Docker Hub CLI](https://github.com/docker/hub-tool#readme){: target="_blank" rel="noopener" class="_"} +> tool (currently experimental) and an API that allows you to interact with Docker +> Hub. Browse through the [Docker Hub API](/docker-hub/api/latest/){: target="_blank" rel="noopener" class="_"} +> documentation to explore the supported endpoints. From 3cd2e5cdf06b5fdf1657eaffd2a8074e3d939a87 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Thu, 23 Sep 2021 14:16:41 +0100 Subject: [PATCH 4/4] Minor format updates --- desktop/faqs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/faqs.md b/desktop/faqs.md index d2b6d16c8e..ac0d693213 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -240,7 +240,7 @@ Docker Desktop supports two types of symlinks: Windows native symlinks and symli The Windows native symlinks are visible within the containers as symlinks, whereas symlinks created inside a container are represented as [mfsymlinks](https://wiki.samba.org/index.php/UNIX_Extensions#Minshall.2BFrench_symlinks){:target="_blank" rel="noopener" class="_"}. These are regular Windows files with a special metadata. Therefore the symlinks created inside a container appear as symlinks inside the container, but not on the host. -### Filesharing with Kubernetes and WSL 2 +### File sharing with Kubernetes and WSL 2 Docker Desktop mounts the Windows host filesystem under `/run/desktop` inside the container running Kubernetes. -See [this stackoverflow post](https://stackoverflow.com/questions/67746843/clear-persistent-volume-from-a-kubernetes-cluster-running-on-docker-desktop/69273405#69273) for an example of how to configure a Kubernetes Persistent Volume to represent directories on the host. \ No newline at end of file +See the [Stack Overflow post](https://stackoverflow.com/questions/67746843/clear-persistent-volume-from-a-kubernetes-cluster-running-on-docker-desktop/69273405#69273){:target="_blank" rel="noopener" class="_"} for an example of how to configure a Kubernetes Persistent Volume to represent directories on the host.