Skip to content

Commit

Permalink
Merge pull request #25033 from vrothberg/compose-docs
Browse files Browse the repository at this point in the history
compose docs: fix typo
  • Loading branch information
openshift-merge-bot[bot] authored Jan 17, 2025
2 parents a3bb0a1 + 34d4251 commit 0f04ba8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/podman/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var composeCommand = &cobra.Command{
The default compose providers are docker-compose and podman-compose. If installed, docker-compose takes precedence since it is the original implementation of the Compose specification and is widely used on the supported platforms (i.e., Linux, Mac OS, Windows).
If you want to change the default behavior or have a custom installation path for your provider of choice, please change the compose_provider field in containers.conf(5). You may also set PODMAN_COMPOSE_PROVIDER environment variable.`,
If you want to change the default behavior or have a custom installation path for your provider of choice, please change the compose_providers field in containers.conf(5) to compose_providers = ["/path/to/provider"]. You may also set the PODMAN_COMPOSE_PROVIDER environment variable.`,
RunE: composeMain,
ValidArgsFunction: composeCompletion,
Example: `podman compose -f nginx.yaml up --detach
Expand Down
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-compose.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ podman\-compose - Run Compose workloads via an external compose provider

The default compose providers are `docker-compose` and `podman-compose`. If installed, `docker-compose` takes precedence since it is the original implementation of the Compose specification and is widely used on the supported platforms (i.e., Linux, Mac OS, Windows).

If you want to change the default behavior or have a custom installation path for your provider of choice, please change the `compose_provider` field in `containers.conf(5)`. You may also set the `PODMAN_COMPOSE_PROVIDER` environment variable.
If you want to change the default behavior or have a custom installation path for your provider of choice, please change the `compose_providers` field in `containers.conf(5)` to `compose_providers = ["/path/to/provider"]`. You may also set the `PODMAN_COMPOSE_PROVIDER` environment variable.

By default, `podman compose` will emit a warning saying that it executes an external command. This warning can be disabled by setting `compose_warning_logs` to false in `containers.conf(5)` or setting the `PODMAN_COMPOSE_WARNING_LOGS` environment variable to false. See the man page for `containers.conf(5)` for more information.

Expand Down

0 comments on commit 0f04ba8

Please sign in to comment.