Skip to content

Commit

Permalink
Merge pull request #23074 from marinmo/podman-compose-providerfix
Browse files Browse the repository at this point in the history
Make podman-compose refer to podman-compose(1) when using an external provider
  • Loading branch information
openshift-merge-bot[bot] authored Jul 12, 2024
2 parents 2415b4f + 02af4f8 commit e62c928
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/podman/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func composeProviderExec(args []string, stdout io.Writer, stderr io.Writer, warn
logrus.Debugf("Executing compose provider (%s %s) with additional env %s", provider, strings.Join(args, " "), strings.Join(env, " "))

if warn {
fmt.Fprint(os.Stderr, underline(fmt.Sprintf(">>>> Executing external compose provider %q. Please refer to the documentation for details. <<<<\n\n", provider)))
fmt.Fprint(os.Stderr, underline(fmt.Sprintf(">>>> Executing external compose provider %q. Please see podman-compose(1) for how to disable this message. <<<<\n\n", provider)))
}

if err := cmd.Run(); err != nil {
Expand Down
2 changes: 2 additions & 0 deletions docs/source/markdown/podman-compose.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ The default compose providers are `docker-compose` and `podman-compose`. If ins

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.

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.

## OPTIONS

To see supported options of the installed compose provider, please run `podman compose --help`.
Expand Down

0 comments on commit e62c928

Please sign in to comment.