From b694e73d7a8cbc7fe03dcac6f8a2914a788ffed1 Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Tue, 29 Mar 2022 16:57:58 -0500 Subject: [PATCH 1/7] updated PATs --- docker-hub/access-tokens.md | 28 +++++++--------------------- subscription/index.md | 4 ++-- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/docker-hub/access-tokens.md b/docker-hub/access-tokens.md index 9c184dfd27..6f7e678bda 100644 --- a/docker-hub/access-tokens.md +++ b/docker-hub/access-tokens.md @@ -4,15 +4,13 @@ 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. +* 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. 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 @@ -57,24 +55,12 @@ To create your access token: ![PAT Menu](images/hub-create-token.png){:width="700px"} -The access permissions are scopes that set restrictions in your -repositories. For example, for Read & Write permissions, an automation -pipeline can build an image and then push it to a repository. However, it -can not delete the repository. + The access permissions are scopes that set restrictions in your + repositories. For example, for Read & Write permissions, an automation + pipeline can build an image and then push it to a repository. However, it + can not delete the repository. -5. The table below lists the tokens available in each subscription: - - - | Feature | Personal | Pro | Team | Business | - | --------------------- | ---- | ----- | ----- |----- | - | Personal Access Tokens (read, write, delete scope only)* |![yes](/images/green-check.svg)| ![yes](/images/green-check.svg) |![yes](/images/green-check.svg) |![yes](/images/green-check.svg)| - | Scoped Personal Access Tokens | |![yes](/images/green-check.svg)| ![yes](/images/green-check.svg)|![yes](/images/green-check.svg)| - | Unlimited Personal Access Tokens | | | ![yes](/images/green-check.svg)|![yes](/images/green-check.svg)| - - *You can create 1 access token as part of the Docker Personal subscription, 5 tokens as part of Docker Pro, and Unlimited tokens as part of Docker Team and Business subscriptions. - 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 +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"} diff --git a/subscription/index.md b/subscription/index.md index 26a23dc0d6..f7588de075 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -32,7 +32,7 @@ The following sections provide an overview of each tier. To compare features ava Docker Personal is the new name for the Docker Free subscription. With its focus on the open-source communities, individual developers, education, and small businesses, Docker Personal will continue to allow free use of Docker components - including the Docker CLI, Docker Compose, Docker Engine, Docker Desktop, Docker Hub, Kubernetes, Docker Build and Docker BuildKit, Docker Official Images, Docker Scan, and more. -Docker Personal includes unlimited public repositories and unlimited collaborators for public repositories at no cost per month. +Docker Personal includes unlimited public repositories, unlimited scoped tokens and unlimited collaborators for public repositories at no cost per month. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. @@ -40,7 +40,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www. **Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It reduces the amount of time developers spend on mundane and repetitive tasks and empowers developers to spend more time creating value for their customers. -Docker Pro includes all the features available in Personal, additionally, it includes unlimited private repositories, unlimited public repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, [Auto Builds](../docker-hub/builds/index.md) with 5 concurrent builds, 300 [Hub Vulnerability Scans](../docker-hub/vulnerability-scanning.md), 5 [Scoped Access Tokens](../docker-hub/access-tokens.md), and more. +Docker Pro includes all the features available in Personal, additionally, it includes unlimited private repositories, unlimited public repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, [Auto Builds](../docker-hub/builds/index.md) with 5 concurrent builds, 300 [Hub Vulnerability Scans](../docker-hub/vulnerability-scanning.md), unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), and more. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. From 4717e3d082aad56e9705275312357abc8b547562 Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Tue, 29 Mar 2022 17:16:40 -0500 Subject: [PATCH 2/7] mend --- subscription/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subscription/index.md b/subscription/index.md index f7588de075..3a1acb9513 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -32,7 +32,7 @@ The following sections provide an overview of each tier. To compare features ava Docker Personal is the new name for the Docker Free subscription. With its focus on the open-source communities, individual developers, education, and small businesses, Docker Personal will continue to allow free use of Docker components - including the Docker CLI, Docker Compose, Docker Engine, Docker Desktop, Docker Hub, Kubernetes, Docker Build and Docker BuildKit, Docker Official Images, Docker Scan, and more. -Docker Personal includes unlimited public repositories, unlimited scoped tokens and unlimited collaborators for public repositories at no cost per month. +Docker Personal includes unlimited public repositories, unlimmited [Scoped Access Tokens](../docker-hub/access-tokens.md), and unlimited collaborators for public repositories at no cost per month. For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. From eef12c06a4b9008bfe0cd6c8d064c701e18c2dbf Mon Sep 17 00:00:00 2001 From: PeterBParker <62410398+PeterBParker@users.noreply.github.com> Date: Wed, 30 Mar 2022 11:55:05 -0500 Subject: [PATCH 3/7] Update compose-file-v3.md corrected duplicate being verb --- compose/compose-file/compose-file-v3.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/compose-file/compose-file-v3.md b/compose/compose-file/compose-file-v3.md index 0ea84af7ba..dc620f697c 100644 --- a/compose/compose-file/compose-file-v3.md +++ b/compose/compose-file/compose-file-v3.md @@ -1798,8 +1798,8 @@ the service's task containers. specified. - `mode`: The permissions for the file to be mounted in `/run/secrets/` in the service's task containers, in octal notation. For instance, `0444` - represents world-readable. The default in Docker 1.13.1 is `0000`, but is - be `0444` in newer versions. Secrets cannot be writable because they are mounted + represents world-readable. The default in Docker 1.13.1 is `0000`, but it is + `0444` in newer versions. Secrets cannot be writable because they are mounted in a temporary filesystem, so if you set the writable bit, it is ignored. The executable bit can be set. If you aren't familiar with UNIX file permission modes, you may find this From 4d69dd8a9b4c87043107f8960dcc689fc5361d33 Mon Sep 17 00:00:00 2001 From: Jerae Duffin Date: Fri, 25 Mar 2022 09:35:09 -0500 Subject: [PATCH 4/7] updated onboarding faqs --- docker-hub/onboarding-faqs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-hub/onboarding-faqs.md b/docker-hub/onboarding-faqs.md index d130012892..c237ffc5a0 100644 --- a/docker-hub/onboarding-faqs.md +++ b/docker-hub/onboarding-faqs.md @@ -29,7 +29,7 @@ manage users, teams, and repositories in the organization. [Learn more](orgs.md) ### How many organizations can I create? -You can create multiple organizations. However, if you’re enabling SSO and have multiple organizations, each organization must have a domain associated with it. +To begin, you should set up your first organization and contact the Customer Success team at customer-success@docker.com to add the additional organizations. Also, if you are enabling SSO, it is configured based on your domain, not your organization. ### What’s a team? From 55d18699e4a65a00fe421970c4c5396b4c9bbc0f Mon Sep 17 00:00:00 2001 From: Piotr Date: Thu, 31 Mar 2022 11:25:43 +0200 Subject: [PATCH 5/7] desktop/linux: Add instructions to remove old systemd units (#14468) * desktop/linux: Add instructions to remove old systemd units Signed-off-by: Piotr Stankiewicz * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- desktop/linux/.index.md.swp | Bin 0 -> 24576 bytes desktop/linux/index.md | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 desktop/linux/.index.md.swp diff --git a/desktop/linux/.index.md.swp b/desktop/linux/.index.md.swp new file mode 100644 index 0000000000000000000000000000000000000000..d53376cc0d4dde33d886f168f8d65c98506227dd GIT binary patch literal 24576 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 Date: Thu, 31 Mar 2022 11:54:12 +0200 Subject: [PATCH 6/7] DD4L: document pass setup and use (#14477) * DD4L: document pass setup and use Signed-off-by: Anca Iordache * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> * Update desktop/linux/index.md Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> --- desktop/linux/index.md | 62 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/desktop/linux/index.md b/desktop/linux/index.md index 352e5da275..4d54ba9a58 100644 --- a/desktop/linux/index.md +++ b/desktop/linux/index.md @@ -28,7 +28,7 @@ To install Docker Desktop for Linux: 1. Set up the [Docker repository](../../engine/install/ubuntu.md#install-using-the-repository). 2. Download and install the Debian package. If you have previously installed one of the preview releases, we recommend that you run `sudo apt remove docker-desktop`: ```console - $ curl https://desktop-stage.docker.com/linux/main/amd64/76677/docker-desktop.deb --output docker-desktop.deb + $ curl https://desktop-stage.docker.com/linux/main/amd64/76787/docker-desktop.deb --output docker-desktop.deb $ sudo apt install ./docker-desktop.deb ``` @@ -84,12 +84,6 @@ API version: 1.41 ... ``` -> **Note:** -> -> Docker Desktop relies on `pass` to store credentials. Before signing in to -> Docker Hub from the Docker Dashboard or the Docker menu, you must initialize `pass`. -> Docker Desktop displays a warning if you've not initialized `pass`. - To enable Docker Desktop to start on login, from the Docker menu, select **Settings** > **General** > **Start Docker Desktop when you log in**. @@ -107,6 +101,60 @@ Alternatively, open a terminal and run: $ systemctl --user stop docker-desktop ``` +## Credentials management + +Docker Desktop relies on [`pass`](https://www.passwordstore.org/){: target="_blank" rel="noopener" class="_"} to store credentials in gpg2-encrypted files. +Before signing in to Docker Hub from the Docker Dashboard or the Docker menu, you must initialize `pass`. +Docker Desktop displays a warning if you've not initialized `pass`. + +You can intialize pass by using a gpg key. To generate a gpg key, run: + +``` console +$ gpg --generate-key +... +GnuPG needs to construct a user ID to identify your key. + +Real name: Molly +Email address: molly@docker.com +You selected this USER-ID: + "Molly " + +Change (N)ame, (E)mail, or (O)kay/(Q)uit? O +... +pub rsa3072 2022-03-31 [SC] [expires: 2024-03-30] + 7865BA9185AFA2C26C5B505669FC4F36530097C2 +uid Molly +sub rsa3072 2022-03-31 [E] [expires: 2024-03-30] +``` + +To initialize `pass`, run: + +```console +molly@ubuntu:~$ pass init 7865BA9185AFA2C26C5B505669FC4F36530097C2 +mkdir: created directory '/home/molly/.password-store/' +Password store initialized for 7865BA9185AFA2C26C5B505669FC4F36530097C2 +``` + +After signing in on the Docker Dashboard, you can check whether the login credentials are stored in the password store. + +```console +molly@ubuntu:~$ docker-credential-desktop list +{"https://index.docker.io/v1/":"molly","https://index.docker.io/v1//refresh-token":"v1.Mb66i2rHIBOjNVkKpKpv8zYQU-gwtNam_5RbYZmsUCQ_smw2WiliFrJlUw5rszR947C2iZ4QGAJ1g5opK1URwaY","https://index.docker.io/v1//user":"molly"} +``` + +When credentials are used by the Docker CLI or Docker Desktop, a user prompt may pop up for the password you set during the gpg key generation. + +```console +$ docker pull molly/privateimage +Using default tag: latest +latest: Pulling from molly/privateimage +3b9cc81c3203: Pull complete +Digest: sha256:3c6b73ce467f04d4897d7a7439782721fd28ec9bf62ea2ad9e81a5fb7fb3ff96 +Status: Downloaded newer image for molly/privateimage:latest +docker.io/molly/privateimage:latest +``` + + ## Logs To create and upload a diagnostics bundle: From 32d351a5f8c8ae5f42665030db2dd42be1aec1e4 Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Thu, 31 Mar 2022 16:05:05 +0200 Subject: [PATCH 7/7] DD4L doc updates Signed-off-by: Anca Iordache --- desktop/linux/index.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/desktop/linux/index.md b/desktop/linux/index.md index 4d54ba9a58..f40fcc032a 100644 --- a/desktop/linux/index.md +++ b/desktop/linux/index.md @@ -115,15 +115,15 @@ $ gpg --generate-key GnuPG needs to construct a user ID to identify your key. Real name: Molly -Email address: molly@docker.com +Email address: molly@example.com You selected this USER-ID: - "Molly " + "Molly " Change (N)ame, (E)mail, or (O)kay/(Q)uit? O ... pub rsa3072 2022-03-31 [SC] [expires: 2024-03-30] 7865BA9185AFA2C26C5B505669FC4F36530097C2 -uid Molly +uid Molly sub rsa3072 2022-03-31 [E] [expires: 2024-03-30] ``` @@ -135,13 +135,7 @@ mkdir: created directory '/home/molly/.password-store/' Password store initialized for 7865BA9185AFA2C26C5B505669FC4F36530097C2 ``` -After signing in on the Docker Dashboard, you can check whether the login credentials are stored in the password store. - -```console -molly@ubuntu:~$ docker-credential-desktop list -{"https://index.docker.io/v1/":"molly","https://index.docker.io/v1//refresh-token":"v1.Mb66i2rHIBOjNVkKpKpv8zYQU-gwtNam_5RbYZmsUCQ_smw2WiliFrJlUw5rszR947C2iZ4QGAJ1g5opK1URwaY","https://index.docker.io/v1//user":"molly"} -``` - +Once `pass` is initialized, we can sign in on the Docker Dashboard and pull our private images. When credentials are used by the Docker CLI or Docker Desktop, a user prompt may pop up for the password you set during the gpg key generation. ```console