From ac73249bf9b4dff161e752ff2e8fa64b204ee354 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:46:19 +0100 Subject: [PATCH 1/5] site: remove target=_blank Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../edge-releases-windows.md | 2 +- content/reference/api/hub/latest.yaml | 2 +- layouts/_default/_markup/render-link.html | 1 - layouts/partials/github-links.html | 4 +-- layouts/shortcodes/desktop-install-v2.html | 24 ++++++++--------- layouts/shortcodes/desktop-install.html | 26 +++++++++---------- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/content/manuals/desktop/previous-versions/edge-releases-windows.md b/content/manuals/desktop/previous-versions/edge-releases-windows.md index b458ad0685c7..537b2b5d0bee 100644 --- a/content/manuals/desktop/previous-versions/edge-releases-windows.md +++ b/content/manuals/desktop/previous-versions/edge-releases-windows.md @@ -2279,7 +2279,7 @@ This Beta release includes some significant changes: **Upgrades** -* docker-compose 1.7.1 (see changelog) +* docker-compose 1.7.1 (see [changelog](https://github.com/docker/compose/releases/tag/1.7.1)) * Kernel 4.4.9 **Bug fixes and minor changes** diff --git a/content/reference/api/hub/latest.yaml b/content/reference/api/hub/latest.yaml index 702a7f2532f7..94f3366a5447 100644 --- a/content/reference/api/hub/latest.yaml +++ b/content/reference/api/hub/latest.yaml @@ -23,7 +23,7 @@ tags: description: | The following resources are available to interact with the documented API: - - Docker Hub CLI tool (currently experimental) + - Docker Hub CLI tool (currently experimental) - name: rate-limiting x-displayName: Rate Limiting description: | diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index 38353aa933b8..ce4701398413 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -4,7 +4,6 @@ {{- .Text | safeHTML -}} diff --git a/layouts/partials/github-links.html b/layouts/partials/github-links.html index b10ebe2d7faf..75ce8d543290 100644 --- a/layouts/partials/github-links.html +++ b/layouts/partials/github-links.html @@ -3,7 +3,7 @@ {{ if not (in .Filename "/_vendor/") }}

{{ partialCached "icon" "edit" "edit" }} - {{- T "editPage" -}} {{ partialCached "icon" "open_in_new" "open_in_new" }} @@ -13,7 +13,7 @@ {{ end }}

{{ partialCached "icon" "check" "check" }} - {{- T "requestChanges" -}} {{ partialCached "icon" "open_in_new" "open_in_new" }} diff --git a/layouts/shortcodes/desktop-install-v2.html b/layouts/shortcodes/desktop-install-v2.html index 4412e88b888b..e2cf1dac9e8e 100644 --- a/layouts/shortcodes/desktop-install-v2.html +++ b/layouts/shortcodes/desktop-install-v2.html @@ -8,38 +8,38 @@

Download Docker Desktop

{{- if or $all $win }} - Windows - (checksum) | {{ end }} {{- if or $beta_win_arm }} - Windows ARM Beta - (checksum) | {{ end }} {{- if or $all $mac }} - Mac + Mac with Apple chip - (checksum) | - Mac + Mac with Intel chip - (checksum) {{ end -}} {{- if or $all $linux }} | - Debian - - RPM - - Arch - (checksum) {{- end -}}

diff --git a/layouts/shortcodes/desktop-install.html b/layouts/shortcodes/desktop-install.html index 57b436032cee..c3f44fb2738c 100644 --- a/layouts/shortcodes/desktop-install.html +++ b/layouts/shortcodes/desktop-install.html @@ -9,39 +9,39 @@

Download Docker Desktop

{{- if or $all $win }} - Windows - (checksum) | {{ end }} {{- if or $beta_win_arm }} - Windows ARM Beta - (checksum) | {{ end }} {{- if or $all $mac }} - Mac + Mac with Apple chip - (checksum) | - Mac + Mac with Intel chip - (checksum) {{ end -}} {{- if or $all $linux }} | - Debian - - RPM - - Arch - (checksum) {{- end -}}

- \ No newline at end of file + From a8cf3e5ac76c454c10cbad1f60c631074d87507b Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:51:57 +0100 Subject: [PATCH 2/5] fix: inconsistent casing for Testcontainers Cloud Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index 145635be9747..bb1938cd19d6 100644 --- a/content/_index.md +++ b/content/_index.md @@ -135,7 +135,7 @@ grid: url: "/security/for-admins/single-sign-on/" - text: "SCIM" url: "/security/for-admins/provisioning/scim/" - - title: Testcontainers cloud + - title: Testcontainers Cloud icon: cloud description: | Testcontainers Cloud lets you run heavy test workloads remotely. From b45343701b07ad1a523b6bb157179c4423843933 Mon Sep 17 00:00:00 2001 From: "Jakub T. Jankiewicz" Date: Wed, 30 Oct 2024 21:31:19 +0100 Subject: [PATCH 3/5] engine: enable docker service after installation on fedora --- content/manuals/engine/install/fedora.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/content/manuals/engine/install/fedora.md b/content/manuals/engine/install/fedora.md index 4c2f4c5f45fb..de2399515a68 100644 --- a/content/manuals/engine/install/fedora.md +++ b/content/manuals/engine/install/fedora.md @@ -191,7 +191,13 @@ download a new file each time you want to upgrade Docker Engine. $ sudo systemctl start docker ``` -4. Verify that the Docker Engine installation is successful by running the +4. Make Docker start automatically after reboot. + + ```console + $ sudo systemctl enable docker + ``` + +5. Verify that the Docker Engine installation is successful by running the `hello-world` image. ```console From f90cdd068e51fd08ff106e8fedaa862530b558ba Mon Sep 17 00:00:00 2001 From: "Paul \"TBBle\" Hampson" Date: Fri, 1 Nov 2024 00:15:59 +0900 Subject: [PATCH 4/5] Correct Youki setup guide link See https://github.com/youki-dev/youki/issues/2967 Signed-off-by: Paul "TBBle" Hampson --- content/manuals/engine/daemon/alternative-runtimes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/engine/daemon/alternative-runtimes.md b/content/manuals/engine/daemon/alternative-runtimes.md index 0cde0c7cfb34..854f73e09797 100644 --- a/content/manuals/engine/daemon/alternative-runtimes.md +++ b/content/manuals/engine/daemon/alternative-runtimes.md @@ -133,7 +133,7 @@ To add youki as a container runtime: 1. Install youki and its dependencies. For instructions, refer to the - [official setup guide](https://containers.github.io/youki/user/basic_setup.html). + [official setup guide](https://youki-dev.github.io/youki/user/basic_setup.html). 2. Register youki as a runtime for Docker by editing the Docker daemon configuration file, located at `/etc/docker/daemon.json` by default. From 27ed5fb536c00436033516cdf3bd8aa1349ca20b Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Thu, 31 Oct 2024 16:15:15 -0700 Subject: [PATCH 5/5] Updates to For developers SSO docs --- content/manuals/security/for-developers/2fa/_index.md | 5 ++--- .../manuals/security/for-developers/2fa/disable-2fa.md | 2 +- .../security/for-developers/2fa/new-recovery-code.md | 2 +- .../security/for-developers/2fa/recover-hub-account.md | 2 +- .../manuals/security/for-developers/access-tokens.md | 10 +++++----- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/content/manuals/security/for-developers/2fa/_index.md b/content/manuals/security/for-developers/2fa/_index.md index d38a2894fa50..70c17401f3b5 100644 --- a/content/manuals/security/for-developers/2fa/_index.md +++ b/content/manuals/security/for-developers/2fa/_index.md @@ -17,7 +17,6 @@ code. Each recovery code is unique and specific to your account. You can use this code to recover your account in case you lose access to your authenticator app. See [Recover your Docker account](recover-hub-account/). - ## Prerequisites You need a mobile phone with a time-based one-time password (TOTP) authenticator @@ -27,11 +26,11 @@ Authenticator with a registered YubiKey. ## Enable two-factor authentication 1. Sign in to your [Docker account](https://app.docker.com/login). -2. Select your avatar and then from the drop-down menu, select **Account settings**. +2. Select your avatar and then from the drop-down menu, select **Account settings**. 3. Navigate to the **Security** section, then select **Two-factor authentication**. 4. Enter your account password, then select **Confirm**. 5. Save your recovery code and store it somewhere safe. You can use your recovery code to recover your account in the event you lose access to your authenticator app. -6. Use a TOTP mobile app to scan the QR code or enter the text code. +6. Use a Time-based One-time password (TOTP) mobile app to scan the QR code or enter the text code. 7. Once you've linked your authenticator app, enter the six-digit code in the text-field. 8. Select **Enable 2FA**. diff --git a/content/manuals/security/for-developers/2fa/disable-2fa.md b/content/manuals/security/for-developers/2fa/disable-2fa.md index 4ee56984341d..a0fbb74027a9 100644 --- a/content/manuals/security/for-developers/2fa/disable-2fa.md +++ b/content/manuals/security/for-developers/2fa/disable-2fa.md @@ -4,7 +4,7 @@ keywords: Docker, docker, registry, security, Docker Hub, authentication, two-fa authentication, account security, title: Disable two-factor authentication on your Docker account linkTitle: Disable two-factor authentication -aliases: +aliases: - /docker-hub/2fa/disable-2fa/ weight: 30 --- diff --git a/content/manuals/security/for-developers/2fa/new-recovery-code.md b/content/manuals/security/for-developers/2fa/new-recovery-code.md index 3f5b2b22efea..e608ff55147b 100644 --- a/content/manuals/security/for-developers/2fa/new-recovery-code.md +++ b/content/manuals/security/for-developers/2fa/new-recovery-code.md @@ -18,4 +18,4 @@ access to your Docker Hub account, you can generate a new recovery code. 5. Select **Generate new code**. This generates a new code. Select the visibility icon to view the code. Remember to save your recovery code -and store it somewhere safe. +and store it somewhere safe. \ No newline at end of file diff --git a/content/manuals/security/for-developers/2fa/recover-hub-account.md b/content/manuals/security/for-developers/2fa/recover-hub-account.md index e331c6b744ac..e8424ccd43a4 100644 --- a/content/manuals/security/for-developers/2fa/recover-hub-account.md +++ b/content/manuals/security/for-developers/2fa/recover-hub-account.md @@ -12,5 +12,5 @@ If you have lost access to both your two-factor authentication application and y 1. Sign in to your [Docker account](https://app.docker.com/login) with your username and password. 2. Select **I've lost my authentication device** and **I've lost my recovery code**. -3. Complete the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout). +3. Complete the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout). You must enter the primary email address associated with your Docker ID in the **Contact Support** form for recovery instructions. diff --git a/content/manuals/security/for-developers/access-tokens.md b/content/manuals/security/for-developers/access-tokens.md index 7054d345f8ff..a7af86ee1666 100644 --- a/content/manuals/security/for-developers/access-tokens.md +++ b/content/manuals/security/for-developers/access-tokens.md @@ -4,7 +4,7 @@ linkTitle: Access tokens description: Learn how to create and manage your personal Docker access tokens to securely push and pull images programmatically. keywords: docker hub, hub, security, PAT, personal access token -aliases: +aliases: - /docker-hub/access-tokens/ --- @@ -13,8 +13,8 @@ You can create a personal access token (PAT) to use as an alternative to your pa Compared to passwords, PATs provide the following advantages: - You can investigate when the PAT was last used and then 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 administrative activity on the account, including changing the password. It protects your account if your computer is compromised. + Access tokens are also valuable for building integrations, as you can issue multiple tokens, one for each integration, and revoke them at any time. @@ -33,7 +33,7 @@ any time. 4. Select **Generate new token**. 5. Add a description for your token. Use something that indicates the use case or purpose of the token. - + 6. Set the access permissions. The access permissions are scopes that set restrictions in your repositories. For example, for Read & Write permissions, an automation @@ -81,4 +81,4 @@ You can rename, activate, deactivate, or delete a token as needed. You can manag When you sign in to your Docker account with Docker Desktop, Docker Desktop generates an authentication token on your behalf. When you interact with Docker Hub using the Docker CLI, the CLI uses this token for authentication. The token scope has Read, Write, and Delete access. If your Docker Desktop session expires, the token is automatically removed locally. -You can have up to 5 auto-generated tokens associated with your account. These are deleted and created automatically based on usage and creation dates. You can also delete your auto-generated tokens as needed. See [Modify existing tokens](#modify-existing-tokens). +You can have up to 5 auto-generated tokens associated with your account. These are deleted and created automatically based on usage and creation dates. You can also delete your auto-generated tokens as needed. For more information, see [Modify existing tokens](#modify-existing-tokens).