Skip to content

Fix azd issue #393 #4567

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.

Sign up for GitHub

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

Merged
vhvb1989 merged 7 commits into from
Dec 6, 2024
Merged

Fix azd issue #393 #4567

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ef62ab
fix-issue#393
v-weiyding Nov 14, 2024
7a93e52
Update
v-weiyding Nov 19, 2024
c522991
Update
v-weiyding Nov 19, 2024
707f43d
Update
v-weiyding Nov 19, 2024
d38d2f5
update error message
v-weiyding Nov 22, 2024
bb9cd13
Merge branch 'Azure:main' into fix-issue#393
v-weiyding Dec 6, 2024
84fc3c2
update
v-weiyding Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions cli/azd/pkg/tools/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,21 +247,26 @@ func isSupportedDockerVersion(cliOutput string) (bool, error) {
return false, fmt.Errorf("could not determine version from docker version string: %s", version)
}
func (d *Cli) CheckInstalled(ctx context.Context) error {
toolName := d.Name()
err := tools.ToolInPath("docker")
if err != nil {
return err
}
dockerRes, err := tools.ExecuteCommand(ctx, d.commandRunner, "docker", "--version")
if err != nil {
return fmt.Errorf("checking %s version: %w", d.Name(), err)
return fmt.Errorf("checking %s version: %w", toolName, err)
}
log.Printf("docker version: %s", dockerRes)
supported, err := isSupportedDockerVersion(dockerRes)
if err != nil {
return err
}
if !supported {
return &tools.ErrSemver{ToolName: d.Name(), VersionInfo: d.versionInfo()}
return &tools.ErrSemver{ToolName: toolName, VersionInfo: d.versionInfo()}
}
// Check if docker daemon is running
if _, err := tools.ExecuteCommand(ctx, d.commandRunner, "docker", "ps"); err != nil {
return fmt.Errorf("the %s daemon is not running, please start the %s service: %w", toolName, toolName, err)
}
return nil
}
Expand Down