From 33bccdc8aee59c1b6f45133a96d185d52bb8eacc Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Mon, 17 Mar 2025 08:53:13 -0400 Subject: [PATCH 1/3] admin: add FAQ and add deactivate org to org section (#22236) ## Description - Added an FAQ about changing your Docker ID (not possible) - Noticed deactivate an org was out in its own section, so I moved it under Organization administration - Fixed some broken links ## Related issues or tickets - [ENGDOCS-2465](https://docker.atlassian.net/browse/ENGDOCS-2465) ## Reviews - [ ] Editorial review [ENGDOCS-2465]: https://docker.atlassian.net/browse/ENGDOCS-2465?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- content/manuals/accounts/deactivate-user-account.md | 2 +- content/manuals/admin/faqs/general-faqs.md | 10 ++++++++-- .../admin/{ => organization}/deactivate-account.md | 9 +++++---- content/manuals/admin/organization/orgs.md | 4 ++-- layouts/shortcodes/admin-domain-audit.md | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) rename content/manuals/admin/{ => organization}/deactivate-account.md (81%) diff --git a/content/manuals/accounts/deactivate-user-account.md b/content/manuals/accounts/deactivate-user-account.md index 887f83f86bfa..21788c607b31 100644 --- a/content/manuals/accounts/deactivate-user-account.md +++ b/content/manuals/accounts/deactivate-user-account.md @@ -5,7 +5,7 @@ description: Learn how to deactivate a Docker user account. keywords: Docker Hub, delete, deactivate, account, account management --- -You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate a user account. For information on deactivating an organization, see [Deactivating an organization](../admin/deactivate-account.md). +You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate a user account. For information on deactivating an organization, see [Deactivating an organization](../admin/organization/deactivate-account.md). >[!WARNING] > diff --git a/content/manuals/admin/faqs/general-faqs.md b/content/manuals/admin/faqs/general-faqs.md index eb34f31a5fcb..2bd3216269c9 100644 --- a/content/manuals/admin/faqs/general-faqs.md +++ b/content/manuals/admin/faqs/general-faqs.md @@ -19,6 +19,12 @@ For more information, see [Docker ID](/accounts/create-account/). If your admini Developers may have multiple Docker IDs in order to separate their Docker IDs associated with an organization with a Docker Business or Team subscription, and their personal use Docker IDs. +### Can I change my Docker ID? + +No. You can't change your Docker ID once it's created. If you need a different Docker ID, you must create a new Docker account with a new Docker ID. + +Additionally, you can't reuse a Docker ID in the future if you deactivate your account. + ### What if my Docker ID is taken? All Docker IDs are first-come, first-served except for companies that have a US Trademark on a username. If you have a trademark for your namespace, [Docker Support](https://hub.docker.com/support/contact/) can retrieve the Docker ID for you. @@ -73,7 +79,7 @@ A [service account](../../docker-hub/service-accounts.md) is a Docker ID used fo ### Can I delete or deactivate a Docker account for another user? -Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../../admin/deactivate-account.md). +Only someone with access to the Docker account can deactivate the account. For more details, see [Deactivating an account](../../admin/organization/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). @@ -85,4 +91,4 @@ You can manage your account settings anytime when you sign in to your [Docker ac To add an avatar to your Docker account, create a [Gravatar account](https://gravatar.com/) and create your avatar. Next, add your Gravatar email to your Docker account settings. -Note, that it may take some time for your avatar to update in Docker. +Note, that it may take some time for your avatar to update in Docker. \ No newline at end of file diff --git a/content/manuals/admin/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md similarity index 81% rename from content/manuals/admin/deactivate-account.md rename to content/manuals/admin/organization/deactivate-account.md index e23437a7b20b..77a0dab78df0 100644 --- a/content/manuals/admin/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -2,13 +2,14 @@ title: Deactivate an organization description: Learn how to deactivate a Docker organization. keywords: Docker Hub, delete, deactivate organization, account, organization management +weight: 42 aliases: - /docker-hub/deactivate-account/ --- {{< summary-bar feature_name="General admin" >}} -You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate an organization account. For information on deactivating a user account, see [Deactivate a user account](../accounts/deactivate-user-account.md). +You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate an organization account. For information on deactivating a user account, see [Deactivate a user account](../../accounts/deactivate-user-account.md). > [!WARNING] > @@ -21,13 +22,13 @@ Before deactivating an organization, complete the following: - Download any images and tags you want to keep: `docker pull -a :`. -- If you have an active Docker subscription, [downgrade it to a free subscription](../subscription/change.md). +- If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md). - Remove all other members within the organization. -- Unlink your [Github and Bitbucket accounts](../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account). +- Unlink your [Github and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account). -- For Business organizations, [remove your SSO connection](../security/for-admins/single-sign-on/manage/#remove-an-organization). +- For Business organizations, [remove your SSO connection](../../security/for-admins/single-sign-on/manage/#remove-an-organization). ## Deactivate diff --git a/content/manuals/admin/organization/orgs.md b/content/manuals/admin/organization/orgs.md index 5a06111f5497..bccc20749b65 100644 --- a/content/manuals/admin/organization/orgs.md +++ b/content/manuals/admin/organization/orgs.md @@ -127,7 +127,7 @@ configure your organization. - **Settings**: Displays information about your organization, and you to view and change your repository privacy settings, configure org permissions such as - [Image Access Management](/manuals/security/for-admins/hardened-desktop/image-access-management.md), configure notification settings, and [deactivate](../deactivate-account.md#deactivate-an-organization) You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the + [Image Access Management](/manuals/security/for-admins/hardened-desktop/image-access-management.md), configure notification settings, and [deactivate](/manuals/admin/organization/deactivate-account.md#deactivate-an-organization) You can also update your organization name and company name that appear on your organization landing page. You must be an owner to access the organization's **Settings** page. - **Billing**: Displays information about your existing @@ -158,7 +158,7 @@ configure your organization. - **Security and access**: Manage security settings. For more information, see [Security](/manuals/security/_index.md). -- **Organization settings**: Update general settings, manage your company settings, or [deactivate your organization](/manuals/admin/deactivate-account.md). +- **Organization settings**: Update general settings, manage your company settings, or [deactivate your organization](/manuals/admin/organization/deactivate-account.md). {{< /tab >}} {{< /tabs >}} diff --git a/layouts/shortcodes/admin-domain-audit.md b/layouts/shortcodes/admin-domain-audit.md index 983555f834f8..ff543554745f 100644 --- a/layouts/shortcodes/admin-domain-audit.md +++ b/layouts/shortcodes/admin-domain-audit.md @@ -26,5 +26,5 @@ You can invite all the uncaptured users to your organization using the exported > > Domain audit may identify accounts of users who are no longer a part of your organization. If you don't want to add a user to your organization and you don't want the user to appear in future domain audits, you must deactivate the account or update the associated email address. > -> Only someone with access to the Docker account can deactivate the account or update the associated email address. For more details, see [Deactivating an account](/admin/deactivate-account/). +> Only someone with access to the Docker account can deactivate the account or update the associated email address. For more details, see [Deactivating an account](/admin/organization/deactivate-account/). > From 9b28dc7adef1956c367f610b42e7bb949a6a096d Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 17 Mar 2025 07:18:57 -0600 Subject: [PATCH 2/3] Improve some API docs and add members fields (#22237) ## Description - Adds missing information for org members calls. - Improves some areas of the docs. ## Reviews - [x] Technical review - [x] Editorial review - [ ] Product review --- content/reference/api/hub/latest.yaml | 240 +++++++++++++++----------- 1 file changed, 135 insertions(+), 105 deletions(-) diff --git a/content/reference/api/hub/latest.yaml b/content/reference/api/hub/latest.yaml index b24dc73acbeb..3eaff0a31643 100644 --- a/content/reference/api/hub/latest.yaml +++ b/content/reference/api/hub/latest.yaml @@ -113,7 +113,7 @@ tags: description: | The Audit Logs API endpoints allow you to query audit log events across a namespace. - For more information, see [Audit Log](https://docs.docker.com/admin/organization/activity-logs/). + For more information, see [Audit Logs](https://docs.docker.com/admin/organization/activity-logs/). - name: org-settings x-displayName: Org Settings description: | @@ -272,7 +272,7 @@ paths: $ref: '#/components/responses/unauthorized' /v2/access-tokens: post: - summary: Create a personal access token + summary: Create personal access token description: Creates and returns a personal access token. tags: - access-tokens @@ -296,7 +296,7 @@ paths: '401': $ref: '#/components/responses/Unauthorized' get: - summary: Get a list of personal access tokens + summary: List personal access tokens description: Returns a paginated list of personal access tokens. tags: - access-tokens @@ -332,7 +332,7 @@ paths: schema: type: string patch: - summary: Update a personal access token + summary: Update personal access token description: | Updates a personal access token partially. You can either update the token's label or enable/disable it. tags: @@ -357,7 +357,7 @@ paths: '401': $ref: '#/components/responses/Unauthorized' get: - summary: Get a personal access token + summary: Get personal access token description: Returns a personal access token by UUID. tags: - access-tokens @@ -381,7 +381,7 @@ paths: '404': $ref: '#/components/responses/NotFound' delete: - summary: Delete a personal access token + summary: Delete personal access token description: | Deletes a personal access token permanently. This cannot be undone. tags: @@ -395,11 +395,102 @@ paths: $ref: '#/components/responses/Unauthorized' '404': $ref: '#/components/responses/NotFound' + /v2/auditlogs/{account}/actions: + get: + summary: List audit log actions + description: | + List audit log actions for a namespace to be used as a filter for querying audit log events. + operationId: AuditLogs_ListAuditActions + security: + - bearerAuth: [] + responses: + '200': + description: A successful response. + content: + application/json: + schema: + $ref: '#/components/schemas/GetAuditActionsResponse' + examples: + response: + value: + actions: + org: + actions: + - name: team.create + description: contains team create events + label: Team Created + - name: team.delete + description: contains team delete events + label: Team Deleted + - name: team.member.add + description: contains team member add events + label: Team Member Added + - name: team.member.remove + description: contains team member remove events + label: Team Member Removed + - name: team.member.invite + description: contains team member invite events + label: Team Member Invited + - name: member.removed + description: contains org member remove events + label: Organization Member Removed + - name: create + description: contains organization create events + label: Organization Created + label: Organization + repo: + actions: + - name: create + description: contains repository create events + label: Repository Created + - name: delete + description: contains repository delete events + label: Repository Deleted + - name: change_privacy + description: contains repository privacy change events + label: Privacy Changed + - name: tag.push + description: contains image tag push events + label: Tag Pushed + - name: tag.delete + description: contains image tag delete events + label: Tag Deleted + label: Repository + '429': + description: '' + content: + application/json: + schema: {} + examples: + response: + value: + detail: Rate limit exceeded + error: false + '500': + description: '' + content: + application/json: + schema: {} + default: + description: An unexpected error response. + content: + application/json: + schema: + $ref: '#/components/schemas/rpcStatus' + parameters: + - name: account + description: Namespace to query audit log actions for. + in: path + required: true + schema: + type: string + tags: + - audit-logs /v2/auditlogs/{account}: get: - summary: Returns list of audit log events - description: Get audit log events for a given namespace. - operationId: AuditLogs_GetAuditLogs + summary: List audit log events + description: List audit log events for a given namespace. + operationId: AuditLogs_ListAuditLogs security: - bearerAuth: [] responses: @@ -504,97 +595,6 @@ paths: default: 25 tags: - audit-logs - /v2/auditlogs/{account}/actions: - get: - summary: Returns list of audit log actions - description: | - Get audit log actions for a namespace to be used as a filter for querying audit events. - operationId: AuditLogs_GetAuditActions - security: - - bearerAuth: [] - responses: - '200': - description: A successful response. - content: - application/json: - schema: - $ref: '#/components/schemas/GetAuditActionsResponse' - examples: - response: - value: - actions: - org: - actions: - - name: team.create - description: contains team create events - label: Team Created - - name: team.delete - description: contains team delete events - label: Team Deleted - - name: team.member.add - description: contains team member add events - label: Team Member Added - - name: team.member.remove - description: contains team member remove events - label: Team Member Removed - - name: team.member.invite - description: contains team member invite events - label: Team Member Invited - - name: member.removed - description: contains org member remove events - label: Organization Member Removed - - name: create - description: contains organization create events - label: Organization Created - label: Organization - repo: - actions: - - name: create - description: contains repository create events - label: Repository Created - - name: delete - description: contains repository delete events - label: Repository Deleted - - name: change_privacy - description: contains repository privacy change events - label: Privacy Changed - - name: tag.push - description: contains image tag push events - label: Tag Pushed - - name: tag.delete - description: contains image tag delete events - label: Tag Deleted - label: Repository - '429': - description: '' - content: - application/json: - schema: {} - examples: - response: - value: - detail: Rate limit exceeded - error: false - '500': - description: '' - content: - application/json: - schema: {} - default: - description: An unexpected error response. - content: - application/json: - schema: - $ref: '#/components/schemas/rpcStatus' - parameters: - - name: account - description: Namespace to query audit log actions for. - in: path - required: true - schema: - type: string - tags: - - audit-logs /v2/orgs/{name}/settings: parameters: - in: path @@ -741,7 +741,6 @@ paths: '404': $ref: '#/components/responses/NotFound' /v2/orgs/{org_name}/members: - x-audience: public parameters: - $ref: '#/components/parameters/org_name' - $ref: '#/components/parameters/search' @@ -753,7 +752,15 @@ paths: get: summary: List org members description: | - Returns a list of members for an organization + Returns a list of members for an organization. + + _The following fields are only visible to orgs with insights enabled._ + + - `last_logged_in_at` + - `last_seen_at` + - `last_desktop_version` + + To make visible, please see [View Insights for organization users](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users). tags: @@ -778,7 +785,6 @@ paths: '404': $ref: '#/components/responses/not_found' /v2/orgs/{org_name}/members/export: - x-audience: public parameters: - $ref: '#/components/parameters/org_name' get: @@ -2439,13 +2445,34 @@ components: - owners is_guest: type: boolean - description: If the organization has verfied domains, members that have email addresses outside of those domains will be flagged as Guest member + description: If the organization has verfied domains, members that have email addresses outside of those domains will be flagged as guests. example: false primary_email: type: string - description: User's email primary address + description: The user's email primary address. example: example@docker.com deprecated: true + last_logged_in_at: + type: string + format: date-time + description: | + Last time the user logged in. To access this field, you must have insights visible for your organization. See + [Insights](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users). + example: '2021-01-05T21:06:53.506400Z' + last_seen_at: + type: string + format: date-time + description: | + Last time the user was seen. To access this field, you must have insights visible for your organization. See + [Insights](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users). + example: '2021-01-05T21:06:53.506400Z' + last_desktop_version: + type: string + description: | + Last desktop version the user used. To access this field, you must have insights visible for your organization. See + [Insights](https://docs.docker.com/admin/organization/insights/#view-insights-for-organization-users). + example: 4.29.0 + org_member_paginated: type: object properties: @@ -2500,6 +2527,7 @@ components: example: Docker Inc date_joined: type: string + format: date-time example: '2021-01-05T21:06:53.506400Z' full_name: type: string @@ -2753,10 +2781,12 @@ components: example: https://hub.docker.com/v2/scim/2.0/Users/d80f7c79-7730-49d8-9a41-7c42fb622d9c created: type: string + format: date-time description: The creation date for the user as a RFC3339 formatted string. example: '2022-05-20T00:54:18Z' lastModified: type: string + format: date-time description: The date the user was last modified as a RFC3339 formatted string. example: '2022-05-20T00:54:18Z' parameters: From 5516466e6c8ae530706b241023c189735e9e4a72 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:46:06 +0100 Subject: [PATCH 3/3] bump compose version to v2.34.0 in hugo.yaml and go.mod (#22264) ## Description Bump version of Compose to `v2.34.0` in `hugo.yaml` and `go.mod` files ## Related issues or tickets N/A ## Reviews - [x] Technical review - [ ] Editorial review - [ ] Product review Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- .../compose/v2/docs/reference/compose.md | 3 +- .../docs/reference/compose_alpha_publish.md | 2 +- .../v2/docs/reference/compose_create.md | 2 +- .../v2/docs/reference/compose_publish.md | 18 +++++ .../compose/v2/docs/reference/compose_run.md | 1 + .../compose/v2/docs/reference/compose_up.md | 2 +- .../v2/docs/reference/docker_compose.yaml | 4 +- .../docker_compose_alpha_publish.yaml | 2 +- .../docs/reference/docker_compose_create.yaml | 2 +- .../reference/docker_compose_publish.yaml | 66 +++++++++++++++++++ .../v2/docs/reference/docker_compose_run.yaml | 10 +++ .../v2/docs/reference/docker_compose_up.yaml | 2 +- _vendor/modules.txt | 4 +- go.mod | 8 +-- go.sum | 2 + hugo.yaml | 2 +- 16 files changed, 115 insertions(+), 15 deletions(-) create mode 100644 _vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md create mode 100644 _vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md index d625c253e675..cf858c1767ed 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md @@ -28,6 +28,7 @@ Define and run multi-container applications with Docker | [`pause`](compose_pause.md) | Pause services | | [`port`](compose_port.md) | Print the public port for a port binding | | [`ps`](compose_ps.md) | List containers | +| [`publish`](compose_publish.md) | Publish compose application | | [`pull`](compose_pull.md) | Pull service images | | [`push`](compose_push.md) | Push service images | | [`restart`](compose_restart.md) | Restart service containers | @@ -67,7 +68,7 @@ Define and run multi-container applications with Docker ## Examples ### Use `-f` to specify the name and path of one or more Compose files -Use the `-f` flag to specify the location of a Compose configuration file. +Use the `-f` flag to specify the location of a Compose [configuration file](/reference/compose-file/). #### Specifying multiple Compose files You can supply multiple `-f` configuration files. When you supply multiple files, Compose combines them into a single diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md index 7d3655352323..6e77d714532b 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md @@ -11,7 +11,7 @@ Publish compose application | `--oci-version` | `string` | | OCI image/artifact specification version (automatically determined by default) | | `--resolve-image-digests` | `bool` | | Pin image tags to digests | | `--with-env` | `bool` | | Include environment variables in the published OCI artifact | -| `-y`, `--y` | `bool` | | Assume "yes" as answer to all prompts | +| `-y`, `--yes` | `bool` | | Assume "yes" as answer to all prompts | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md index b87cce8572b9..4b0b876da91d 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md @@ -16,7 +16,7 @@ Creates containers for a service | `--quiet-pull` | `bool` | | Pull without printing progress information | | `--remove-orphans` | `bool` | | Remove containers for services not defined in the Compose file | | `--scale` | `stringArray` | | Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. | -| `-y`, `--y` | `bool` | | Assume "yes" as answer to all prompts and run non-interactively | +| `-y`, `--yes` | `bool` | | Assume "yes" as answer to all prompts and run non-interactively | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md new file mode 100644 index 000000000000..8e5d181336b2 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_publish.md @@ -0,0 +1,18 @@ +# docker compose publish + + +Publish compose application + +### Options + +| Name | Type | Default | Description | +|:--------------------------|:---------|:--------|:-------------------------------------------------------------------------------| +| `--dry-run` | `bool` | | Execute command in dry run mode | +| `--oci-version` | `string` | | OCI image/artifact specification version (automatically determined by default) | +| `--resolve-image-digests` | `bool` | | Pin image tags to digests | +| `--with-env` | `bool` | | Include environment variables in the published OCI artifact | +| `-y`, `--yes` | `bool` | | Assume "yes" as answer to all prompts | + + + + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md index f46d1872d2b5..e4be01d2db1c 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md @@ -66,6 +66,7 @@ specified in the service configuration. | `--dry-run` | `bool` | | Execute command in dry run mode | | `--entrypoint` | `string` | | Override the entrypoint of the image | | `-e`, `--env` | `stringArray` | | Set environment variables | +| `--env-from-file` | `stringArray` | | Set environment variables from file | | `-i`, `--interactive` | `bool` | `true` | Keep STDIN open even if not attached | | `-l`, `--label` | `stringArray` | | Add or override a label | | `--name` | `string` | | Assign a name to the container | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md index d1478cdd3369..b831cb16d342 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md @@ -53,7 +53,7 @@ If the process is interrupted using `SIGINT` (ctrl + C) or `SIGTERM`, the contai | `--wait` | `bool` | | Wait for services to be running\|healthy. Implies detached mode. | | `--wait-timeout` | `int` | `0` | Maximum duration in seconds to wait for the project to be running\|healthy | | `-w`, `--watch` | `bool` | | Watch source code and rebuild/refresh containers when files are updated. | -| `-y`, `--y` | `bool` | | Assume "yes" as answer to all prompts and run non-interactively | +| `-y`, `--yes` | `bool` | | Assume "yes" as answer to all prompts and run non-interactively | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml index 1c6fb4970e79..a31cb41082eb 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml @@ -22,6 +22,7 @@ cname: - docker compose pause - docker compose port - docker compose ps + - docker compose publish - docker compose pull - docker compose push - docker compose restart @@ -55,6 +56,7 @@ clink: - docker_compose_pause.yaml - docker_compose_port.yaml - docker_compose_ps.yaml + - docker_compose_publish.yaml - docker_compose_pull.yaml - docker_compose_push.yaml - docker_compose_restart.yaml @@ -229,7 +231,7 @@ options: swarm: false examples: |- ### Use `-f` to specify the name and path of one or more Compose files - Use the `-f` flag to specify the location of a Compose configuration file. + Use the `-f` flag to specify the location of a Compose [configuration file](/reference/compose-file/). #### Specifying multiple Compose files You can supply multiple `-f` configuration files. When you supply multiple files, Compose combines them into a single diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml index 91600ac8b442..1566677472ae 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml @@ -35,7 +35,7 @@ options: experimentalcli: false kubernetes: false swarm: false - - option: "y" + - option: "yes" shorthand: "y" value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml index 7cb764098b99..f6ab1b868244 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml @@ -88,7 +88,7 @@ options: experimentalcli: false kubernetes: false swarm: false - - option: "y" + - option: "yes" shorthand: "y" value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml new file mode 100644 index 000000000000..44a7a46dd421 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_publish.yaml @@ -0,0 +1,66 @@ +command: docker compose publish +short: Publish compose application +long: Publish compose application +usage: docker compose publish [OPTIONS] REPOSITORY[:TAG] +pname: docker compose +plink: docker_compose.yaml +options: + - option: oci-version + value_type: string + description: | + OCI image/artifact specification version (automatically determined by default) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: resolve-image-digests + value_type: bool + default_value: "false" + description: Pin image tags to digests + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: with-env + value_type: bool + default_value: "false" + description: Include environment variables in the published OCI artifact + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: "yes" + shorthand: "y" + value_type: bool + default_value: "false" + description: Assume "yes" as answer to all prompts + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: dry-run + value_type: bool + default_value: "false" + description: Execute command in dry run mode + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml index dc19a95de4b6..6e6ec71f8d0a 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml @@ -117,6 +117,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: env-from-file + value_type: stringArray + default_value: '[]' + description: Set environment variables from file + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: interactive shorthand: i value_type: bool diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml index 0ed31b3599ce..47e0c5259ebb 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml @@ -309,7 +309,7 @@ options: experimentalcli: false kubernetes: false swarm: false - - option: "y" + - option: "yes" shorthand: "y" value_type: bool default_value: "false" diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 2d89f7988cb1..a18e9fe2b0be 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v28.0.1+incompatible -# github.com/moby/buildkit v0.20.0 +# github.com/moby/buildkit v0.20.1 # github.com/docker/buildx v0.21.2 # github.com/docker/cli v28.0.1+incompatible -# github.com/docker/compose/v2 v2.33.1 +# github.com/docker/compose/v2 v2.34.0 # github.com/docker/scout-cli v1.15.0 diff --git a/go.mod b/go.mod index 2aa8983667f1..79d90ce1d818 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,20 @@ module github.com/docker/docs -go 1.23.1 +go 1.23.6 require ( github.com/docker/buildx v0.21.2 // indirect github.com/docker/cli v28.0.1+incompatible // indirect - github.com/docker/compose/v2 v2.33.1 // indirect + github.com/docker/compose/v2 v2.34.0 // indirect github.com/docker/scout-cli v1.15.0 // indirect - github.com/moby/buildkit v0.20.0 // indirect + github.com/moby/buildkit v0.20.1 // indirect github.com/moby/moby v28.0.1+incompatible // indirect ) replace ( github.com/docker/buildx => github.com/docker/buildx v0.21.2 github.com/docker/cli => github.com/docker/cli v28.0.1+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.33.1 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.34.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.20.0 github.com/moby/moby => github.com/moby/moby v28.0.1+incompatible diff --git a/go.sum b/go.sum index b702c1f5adee..e20ed5ab56e4 100644 --- a/go.sum +++ b/go.sum @@ -215,6 +215,8 @@ github.com/docker/compose/v2 v2.32.4 h1:h1I7GlJ1NCXKqM0nCVVsMrD/7TdIG48HNgRufcBF github.com/docker/compose/v2 v2.32.4/go.mod h1:fcK4rrf1bm8pfDsYdZIR+l4RSk9j6HVtBvJKGYyXsZ4= github.com/docker/compose/v2 v2.33.1 h1:i/V1gUpdbc4tMRfx30aYzw7oHKM8NGB2Oe4AUJUospw= github.com/docker/compose/v2 v2.33.1/go.mod h1:TdDv/kdWOFrCWum5SVxVGVr+P9znSZepukHF1Dam25U= +github.com/docker/compose/v2 v2.34.0 h1:mUhgA6AiRVO9hEndD2G2oOQi5Y0g/4H8xSPVUc5TYdU= +github.com/docker/compose/v2 v2.34.0/go.mod h1:TgTD4Ku0vOSB3NZgOXp6HcCE6wDSBjg7r8bjWraV5/4= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= diff --git a/hugo.yaml b/hugo.yaml index 9d4bf29e46df..55f3325522bb 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -118,7 +118,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "28.0.0" # Latest Docker Compose version - compose_version: "v2.33.1" + compose_version: "v2.34.0" # Latest BuildKit version buildkit_version: "0.20.0"