1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

seach for provider binary in PATH

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-04-25 17:19:10 +02:00 committed by Nicolas De loof
parent cee6a3c660
commit 20f0ffec0b
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/extension.md
View File

@ -26,13 +26,13 @@ the resource(s) needed to run a service.
- Another Docker CLI plugin (typically, `model` to run `docker-model`) - Another Docker CLI plugin (typically, `model` to run `docker-model`)
- An executable in user's `PATH` - An executable in user's `PATH`
To be a valid Compose extension, provider command *MUST* accept subcommand `compose` (which can be hidden) To be a valid Compose extension, provider command *MUST* accept a `compose` command (which can be hidden)
with subcommands `up` and `down`. with subcommands `up` and `down`.
## Up lifecycle ## Up lifecycle
To execute an application's `up` lifecycle, Compose executes the provider's `compose up` command, passing To execute an application's `up` lifecycle, Compose executes the provider's `compose up` command, passing
the project name, service name and additional options. The `provider.options` are translated the project name, service name, and additional options. The `provider.options` are translated
into command line flags. For example: into command line flags. For example:
```console ```console
awesomecloud compose --project-name <NAME> up --type=mysql --size=256 "database" awesomecloud compose --project-name <NAME> up --type=mysql --size=256 "database"

42
pkg/compose/plugins.go
View File

@ -55,11 +55,7 @@ func (s *composeService) runPlugin(ctx context.Context, project *types.Project,
return err return err
} }
if err := s.checkPluginEnabledInDD(ctx, plugin); err != nil { cmd := s.setupPluginCommand(ctx, project, service, plugin, command)
return err
}
cmd := s.setupPluginCommand(ctx, project, service, plugin.Path, command)
variables, err := s.executePlugin(ctx, cmd, command, service) variables, err := s.executePlugin(ctx, cmd, command, service)
if err != nil { if err != nil {
@ -148,9 +144,18 @@ func (s *composeService) executePlugin(ctx context.Context, cmd *exec.Cmd, comma
return variables, nil return variables, nil
} }
func (s *composeService) getPluginBinaryPath(providerType string) (*manager.Plugin, error) { func (s *composeService) getPluginBinaryPath(provider string) (path string, err error) {
// Only support Docker CLI plugins for first iteration. Could support any binary from PATH if provider == "compose" {
return manager.GetPlugin(providerType, s.dockerCli, &cobra.Command{}) return "", errors.New("'compose' is not a valid provider type")
}
plugin, err := manager.GetPlugin(provider, s.dockerCli, &cobra.Command{})
if err == nil {
path = plugin.Path
}
if manager.IsNotFound(err) {
path, err = exec.LookPath(provider)
}
return path, err
} }
func (s *composeService) setupPluginCommand(ctx context.Context, project *types.Project, service types.ServiceConfig, path, command string) *exec.Cmd { func (s *composeService) setupPluginCommand(ctx context.Context, project *types.Project, service types.ServiceConfig, path, command string) *exec.Cmd {
@ -182,24 +187,3 @@ func (s *composeService) setupPluginCommand(ctx context.Context, project *types.
cmd.Env = append(cmd.Env, types.Mapping(carrier).Values()...) cmd.Env = append(cmd.Env, types.Mapping(carrier).Values()...)
return cmd return cmd
} }
func (s *composeService) checkPluginEnabledInDD(ctx context.Context, plugin *manager.Plugin) error {
if integrationEnabled := s.isDesktopIntegrationActive(); !integrationEnabled {
return fmt.Errorf("you should enable Docker Desktop integration to use %q provider services", plugin.Name)
}
// Until we support more use cases, check explicitly status of model runner
if plugin.Name == "model" {
cmd := exec.CommandContext(ctx, "docker", "model", "status")
_, err := cmd.CombinedOutput()
if err != nil {
var exitErr *exec.ExitError
if errors.As(err, &exitErr) && exitErr.ExitCode() == 1 {
return fmt.Errorf("you should enable model runner to use %q provider services: %s", plugin.Name, err.Error())
}
}
} else {
return fmt.Errorf("unsupported provider %q", plugin.Name)
}
return nil
}