Skip to content

Commit

Permalink
Merge pull request #19665 from dvdksn/taxo
Browse files Browse the repository at this point in the history
hugo: add tags
  • Loading branch information
dvdksn authored Apr 23, 2024
2 parents 749870a + 7c71031 commit 25b21cf
Show file tree
Hide file tree
Showing 85 changed files with 544 additions and 296 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENV NODE_ENV=production
RUN npm install

FROM base AS hugo
ARG HUGO_VERSION=0.122.0
ARG HUGO_VERSION=0.124.1
ARG TARGETARCH
WORKDIR /tmp/hugo
RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
Expand Down
8 changes: 1 addition & 7 deletions assets/css/toc.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
@layer components {
#TableOfContents {
nav {
@apply border-l-2 border-divider-light;
}
ul ul {
@apply pl-2;
}
a {
.toc a {
@apply block max-w-full truncate py-1 pl-2 hover:font-medium hover:no-underline;
&[aria-current="true"],
&:hover {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
description: Company FAQs
keywords: Docker, Docker Hub, SSO FAQs, single sign-on, company, administration, company management
title: FAQs on companies
tags: [FAQ]
aliases:
- /docker-hub/company-faqs/
- /faq/admin/company-faqs/
---

### Are existing subscriptions affected when you create a company and add organizations to it?
Expand Down Expand Up @@ -61,4 +63,4 @@ See [SCIM](scim.md) and [Group mapping](../../security/for-admins/group-mapping.

### What's the definition of a company vs an organization?

A company is a collection of organizations that are managed together. An organization is a collection of repositories and teams that are managed together.
A company is a collection of organizations that are managed together. An organization is a collection of repositories and teams that are managed together.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
title: General FAQs for Docker accounts
description: Frequently asked Docker account and administration questions
keywords: onboarding, docker, teams, orgs, user accounts, organization accounts
tags: [FAQ]
aliases:
- /docker-hub/general-faqs/
- /docker-hub/onboarding-faqs/
- /faq/admin/general-faqs/
---

### What is a Docker ID?
Expand Down Expand Up @@ -58,7 +60,7 @@ The organization owner can also add additional owners to help them manage users,
### Can I configure multiple SSO identity providers (IdPs) to authenticate users to a single org?

Docker SSO allows only one IdP configuration per organization. For more
information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../security/single-sign-on/faqs.md).
information, see [Configure SSO](../../security/for-admins/single-sign-on/configure/_index.md) and [SSO FAQs](../../security/faqs/single-sign-on/faqs.md).

### What is a service account?

Expand All @@ -68,4 +70,4 @@ A [service account](../../docker-hub/service-accounts.md) is a Docker ID used fo

Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../../admin/deactivate-account.md).

If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](../../admin/organization/members.md#remove-a-member-from-a-team).
If the user is a member of your organization, you can remove the user from your organization. For more details, see [Remove a member or invitee](../../admin/organization/members.md#remove-a-member-from-a-team).
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
description: Organization FAQs
keywords: Docker, Docker Hub, SSO FAQs, single sign-on, organizations, administration
title: FAQs on organizations
tags: [FAQ]
aliases:
- /docker-hub/organization-faqs/
- /faq/admin/organization-faqs/
---

### What if the Docker ID I want for my organization or company is taken?
Expand Down Expand Up @@ -88,4 +90,4 @@ organization. See [Configure repository permissions for a team](manage-a-team.md

### Does my organization need to use Docker's registry?

A registry is a hosted service containing repositories of images that responds to the Registry API. Docker Hub is Docker's primary registry, but you can use Docker with other container image registries. You can access the default registry by browsing to [Docker Hub](https://hub.docker.com) or using the `docker search` command.
A registry is a hosted service containing repositories of images that responds to the Registry API. Docker Hub is Docker's primary registry, but you can use Docker with other container image registries. You can access the default registry by browsing to [Docker Hub](https://hub.docker.com) or using the `docker search` command.
1 change: 1 addition & 0 deletions content/billing/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Billing FAQs
description: Frequently asked questions related to billing
keywords: billing, renewal, payments, faq
tags: [FAQ]
---

For more information on billing, see [Billing and payments](_index.md).
Expand Down
2 changes: 1 addition & 1 deletion content/build/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ For more information about BuildKit, see [BuildKit](buildkit/index.md).
The following diagram shows an example build sequence involving Buildx and
BuildKit.

![Buildx and BuildKit sequence diagram](./images/build-execution.png)
![Buildx and BuildKit sequence diagram](./images/build-execution.png)
1 change: 1 addition & 0 deletions content/build/building/secrets.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Build secrets
description: Manage credentials and other secrets securely
keywords: build, secrets, credentials, passwords, tokens, ssh, git, auth, http
tags: [Secrets]
---

A build secret is any piece of sensitive information, such as a password or API
Expand Down
1 change: 1 addition & 0 deletions content/build/ci/github-actions/secrets.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Using secrets with GitHub Actions
description: Example using secret mounts with GitHub Actions
keywords: ci, github actions, gha, buildkit, buildx, secret
tags: [Secrets]
---

A build secret is sensitive information, such as a password or API token, consumed as part of the build process.
Expand Down
1 change: 1 addition & 0 deletions content/build/dockerfile/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Dockerfile release notes
description: Release notes for Dockerfile frontend
keywords: build, dockerfile, frontend, release notes
tags: [Release notes]
toc_max: 2
---

Expand Down
1 change: 1 addition & 0 deletions content/build/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Build release notes
description: Release notes for Buildx
keywords: build, buildx, buildkit, release notes
tags: [Release notes]
toc_max: 2
---

Expand Down
1 change: 1 addition & 0 deletions content/compose/environment-variables/best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ title: Best practices for working with environment variables in Docker Compose
description: Explainer on the best ways to set, use, and manage environment variables in
Compose
keywords: compose, orchestration, environment, env file, environment variables
tags: [Best practices]
---

#### Handle sensitive information securely
Expand Down
3 changes: 2 additions & 1 deletion content/compose/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Frequently asked questions for Docker Compose
keywords: documentation, docs, docker, compose, faq, docker compose vs docker-compose
title: Compose FAQs
tags: [FAQ]
---

{{< include "compose-eol.md" >}}
Expand Down Expand Up @@ -105,4 +106,4 @@ supports hot code reloading or live-reload.
There may be cases where you want to use both. You can have the image
include the code using a `COPY`, and use a `volume` in your Compose file to
include the code from the host during development. The volume overrides
the directory contents of the image.
the directory contents of the image.
2 changes: 1 addition & 1 deletion content/compose/install/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ You can [install the Compose standalone](standalone.md) on Linux or on Windows S
> **Warning**
>
>This install scenario is not recommended and is only supported for backward compatibility purposes.
{ .warning }
{ .warning }
1 change: 1 addition & 0 deletions content/compose/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Docker Compose release notes
description: Release notes for Docker Compose
keywords: release notes, compose
tags: [Release notes]
toc_max: 2
aliases:
- /release-notes/docker-compose/
Expand Down
2 changes: 1 addition & 1 deletion content/compose/samples-for-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ These samples focus specifically on Docker Compose:

## Awesome Compose samples

The Awesome Compose samples provide a starting point on how to integrate different frameworks and technologies using Docker Compose. All samples are available in the [Awesome-compose GitHub repo](https://github.com/docker/awesome-compose) and are ready to run with `docker compose up`.
The Awesome Compose samples provide a starting point on how to integrate different frameworks and technologies using Docker Compose. All samples are available in the [Awesome-compose GitHub repo](https://github.com/docker/awesome-compose) and are ready to run with `docker compose up`.
1 change: 1 addition & 0 deletions content/compose/use-secrets.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: How to use secrets in Docker Compose
description: How to use secrets in Compose and their benefits
keywords: secrets, compose, security, environment variables
tags: [Secrets]
---

A secret is any piece of data, such as a password, certificate, or API key, that shouldn’t be transmitted over a network or stored unencrypted in a Dockerfile or in your application’s source code.
Expand Down
1 change: 1 addition & 0 deletions content/config/daemon/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Troubleshooting the Docker daemon
description: Learn how to troubleshoot errors and misconfigurations in the Docker daemon
keywords: docker, daemon, configuration, troubleshooting, error, fail to start
tags: [ Troubleshooting ]
---

This page describes how to troubleshoot and debug the daemon if you run into
Expand Down
4 changes: 2 additions & 2 deletions content/contribute/components/call-outs.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We support these broad categories of callouts:

## Examples

{{< introduced buildx 0.10.4 "../../release-notes.md#0104" >}}
{{< introduced buildx 0.10.4 >}}

> **Note**
>
Expand Down Expand Up @@ -114,4 +114,4 @@ For both of the following callouts, consult [the Docker release lifecycle](/rele
> Docker Scout is an [early access](/release-lifecycle/#early-access-ea)
> product.
{ .restricted }
```
```
31 changes: 13 additions & 18 deletions content/desktop/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,33 @@ keywords: how to use docker desktop, what is docker desktop used for, what does
title: Overview of Docker Desktop
grid:
- title: Install Docker Desktop
description: 'Install Docker Desktop on
description: |
Install Docker Desktop on
[Mac](/desktop/install/mac-install/),
[Windows](/desktop/install/windows-install/), or
[Linux](/desktop/install/linux-install/).
'
icon: download
- title: Explore Docker Desktop
description: Navigate Docker Desktop and learn about its key features.
icon: feature_search
link: /desktop/use-desktop
link: /desktop/use-desktop/
- title: View the release notes
description: Find out about new features, improvements, and bug fixes.
icon: note_add
link: /desktop/release-notes
link: /desktop/release-notes/
- title: Browse common FAQs
description: Explore general FAQs or FAQs for specific platforms.
icon: help
link: /desktop/faqs/
- title: Find additional resources
description: Find information on networking features, deploying on Kubernetes, and
more.
description: |
Find information on networking features, deploying on Kubernetes, and more.
icon: category
link: /desktop/kubernetes
link: /desktop/kubernetes/
- title: Give feedback
description: Provide feedback on Docker Desktop or Docker Desktop features.
icon: sms
link: /desktop/feedback
link: /desktop/feedback/
aliases:
- /desktop/opensource/
- /docker-for-mac/dashboard/
Expand All @@ -52,17 +48,16 @@ It provides a straightforward GUI (Graphical User Interface) that lets you manag

Docker Desktop reduces the time spent on complex setups so you can focus on writing code. It takes care of port mappings, file system concerns, and other default settings, and is regularly updated with bug fixes and security updates.


{{< tabs >}}
{{< tab name="What's included in Docker Desktop?" >}}

- [Docker Engine](../engine/index.md)
- [Docker Engine](../engine/_index.md)
- Docker CLI client
- [Docker Scout](../scout/_index.md) (additional subscription may apply)
- [Docker Build](../build/index.md)
- [Docker Extensions](extensions/index.md)
- [Docker Compose](../compose/index.md)
- [Docker Content Trust](../engine/security/trust/index.md)
- [Docker Build](../build/_index.md)
- [Docker Extensions](./extensions/_index.md)
- [Docker Compose](../compose/_index.md)
- [Docker Content Trust](../engine/security/trust/_index.md)
- [Kubernetes](https://github.com/kubernetes/kubernetes/)
- [Credential Helper](https://github.com/docker/docker-credential-helpers/)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ Some of the above options require you to extend our MUI theme. See the MUI docum
## What's next?

- Take a look at our [UI styling guide](index.md).
- Learn how to [publish your extension](../extensions/index.md).
- Learn how to [publish your extension](../extensions/index.md).
2 changes: 1 addition & 1 deletion content/desktop/extensions-sdk/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ $ docker extension rm <name-of-your-extension>
- Learn how to [test and debug](dev/test-debug.md) your extension.
- Learn how to [setup CI for your extension](dev/continuous-integration.md).
- Learn more about extensions [architecture](architecture/index.md).
- Learn more about [designing the UI](design/design-guidelines.md).
- Learn more about [designing the UI](design/design-guidelines.md).
1 change: 1 addition & 0 deletions content/desktop/faqs/general.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Frequently asked Docker Desktop questions for all platforms
keywords: desktop, mac, windows, faqs
title: General FAQs for Desktop
tags: [FAQ]
aliases:
- /mackit/faqs/
- /docker-for-mac/faqs/
Expand Down
1 change: 1 addition & 0 deletions content/desktop/faqs/linuxfaqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Frequently asked questions for Docker Desktop for Linux
keywords: desktop, linux, faqs
title: FAQs for Docker Desktop for Linux
tags: [FAQ]
aliases:
- /desktop/linux/space/
---
Expand Down
1 change: 1 addition & 0 deletions content/desktop/faqs/macfaqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Frequently asked questions for Docker Desktop for Mac
keywords: desktop, mac, faqs
title: FAQs for Docker Desktop for Mac
tags: [FAQ]
aliases:
- /desktop/mac/space/
- /docker-for-mac/space/
Expand Down
1 change: 1 addition & 0 deletions content/desktop/faqs/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Frequently asked Docker Desktop questions for all platforms
keywords: desktop, mac, windows, faqs
title: FAQs on Docker Desktop releases
tags: [FAQ]
---

### How frequent will new releases be?
Expand Down
1 change: 1 addition & 0 deletions content/desktop/faqs/windowsfaqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Frequently asked questions for Docker Desktop for Windows
keywords: desktop, windows, faqs
title: FAQs for Docker Desktop for Windows
tags: [FAQ]
---

### Can I use VirtualBox alongside Docker Desktop?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ For more information on how Enhanced Container Isolation work, see [How does it
>
> Enhanced Container Isolation does not yet fully protect Docker builds,
> Kubernetes pods and Extension containers. For more information on known
> limitations and workarounds, see [FAQs](../../../faq/security/eci-faq.md).
> limitations and workarounds, see [FAQs](../../../security/faqs/eci-faq.md).
{.important }

### What host OSes / platforms is Enhanced Container Isolation supported on?
Expand Down Expand Up @@ -87,7 +87,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](../../../faq/security/eci-faq.md).
> Enhanced Container Isolation does not protect containers created prior to enabling ECI. For more information on known limitations and workarounds, see [FAQs](../../../security/faqs/eci-faq.md).
{ .important }

#### As an admin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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](../../../faq/security/eci-faq.md).
see [FAQs](../../../security/faqs/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
Expand Down
2 changes: 1 addition & 1 deletion content/desktop/install/archlinux.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ $ sudo pacman -S gnome-terminal

- Take a look at the [Get started](../../get-started/index.md) training modules to learn how to build an image and run it as a containerized application.
- [Explore Docker Desktop](../use-desktop/index.md) and all its features.
- Review the topics in [Develop with Docker](../../develop/index.md) to learn how to build new applications using Docker.
- Review the topics in [Develop with Docker](../../develop/index.md) to learn how to build new applications using Docker.
1 change: 1 addition & 0 deletions content/desktop/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Release notes for Docker Desktop for Mac, Linux, and Windows
keywords: Docker desktop, release notes, linux, mac, windows
title: Docker Desktop release notes
tags: [Release notes]
toc_max: 2
aliases:
- /docker-for-mac/release-notes/
Expand Down
3 changes: 2 additions & 1 deletion content/desktop/troubleshoot/known-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description: Find known issues for Docker Desktop
keywords: mac, troubleshooting, known issues, Docker Desktop
title: Known issues
tags: [ Troubleshooting ]
---

{{< tabs >}}
Expand Down Expand Up @@ -72,4 +73,4 @@ title: Known issues
- `ping` from inside a container to the Internet does not work as expected. To test the network, use `curl` or `wget`. See [docker/for-mac#5322](https://github.com/docker/for-mac/issues/5322#issuecomment-809392861).
- Users may occasionally experience data drop when a TCP stream is half-closed.
{{< /tab >}}
{{< /tabs >}}
{{< /tabs >}}
Loading

0 comments on commit 25b21cf

Please sign in to comment.