-
Notifications
You must be signed in to change notification settings - Fork 174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
containers.conf: add compose fields #1571
Conversation
Seen in `make validate`. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Mention it in the man page. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Emit logs on each invocation of the compose command indicating that an external compose provider is being executed. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
|
||
func getDefaultComposeProviders() []string { | ||
// Rely on os.LookPath to do the trick on Windows. | ||
return []string{"docker-compose", "podman-compose"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
did you check where the docker-compose plugin is installed on windows? cc @benoitf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I asked others to test on Windows.
|
||
Enforce using docker.io for completing short names in Podman's compatibility | ||
REST API. Note that this will ignore unqualified-search-registries and | ||
short-name aliases defined in containers-registries.conf(5). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did not know this ignored short-names, not so crazy about this, but I guess this is what we got.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was a deliberate decision since we'd otherwise not be Docker compatible.
// ComposeProviders specifies one or more external providers for the | ||
// compose command. The first found provider is used for execution. | ||
// Can be an absolute and relative path or a (file) name. Make sure to | ||
// expand the return items via `os.ExpandEnv`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add a builtin function
ComposeProvidersExpanded()
Which does the os.ExpandEnv for the caller?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I considered it but there is only one caller which will call os.ExpandEnv
on demand, so I thought it's OK.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code LGTM, I cannot really comment on the default path locations but we can tweak them later if needed
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Specify one or more external providers for the compose command. The first found provider is used for execution. Can be an absolute path or a (file) name. Relative names are invalid. File names are evaluated via $PATH look ups. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@ashley-cui @rhatdan PTanotherL |
Darwin paths LGTM |
/lgtm |
Please refer to the individual commits and Podman PR containers/podman#19297 to review the plumbing.