Skip to content
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

add kill process method when docker-compose down command #12206

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion cmd/compose/down.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,20 @@ func runDown(ctx context.Context, dockerCli command.Cli, backend api.Service, op
timeoutValue := time.Duration(opts.timeout) * time.Second
timeout = &timeoutValue
}
return backend.Down(ctx, name, api.DownOptions{
err = backend.Down(ctx, name, api.DownOptions{
RemoveOrphans: opts.removeOrphans,
Project: project,
Timeout: timeout,
Images: opts.images,
Volumes: opts.volumes,
Services: services,
})
if err != nil {
return err
}
err = killProcessesUsingExposedPorts(project)
if err != nil {
return err
}
return nil
}
44 changes: 44 additions & 0 deletions cmd/compose/port_cleanup.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package compose

import (
"fmt"
"os/exec"
"strings"
)

func killProcessesUsingExposedPorts(project *types.Project) error {
for _, service := range project.Services {
for _, port := range service.Ports {
exposedPort := port.Published
if exposedPort != "" {
err := killProcessOnPort(exposedPort)
if err != nil {
return err
}
}
}
}
return nil
}

func killProcessOnPort(port string) error {
cmd := exec.Command("lsof", "-t", "-i", fmt.Sprintf(":%s", port))
output, err := cmd.Output()
if err != nil {
return fmt.Errorf("failed to find process using port %s: %v", port, err)
}

pid := strings.TrimSpace(string(output))
if pid == "" {
return nil
}

killCmd := exec.Command("kill", "-9", pid)
Comment on lines +25 to +36
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part of the code is not portable and won't work on Windows environment for example.
The fix proposed should work for Linux, Mac and Windows

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also Compose is a client library, while docker engine may run on a remote machine, so this isn't the relevant place to propose such a fix. We already invoke ContainerStop API which is responsible to stop (or kill after timeout) the target container and release resources, if you found a bug with this, better report on github.com/moby/moby

err = killCmd.Run()
if err != nil {
return fmt.Errorf("failed to kill process %s on port %s: %v", pid, port, err)
}

fmt.Printf("Killed process %s using port %s\n", pid, port)
return nil
}