Skip to content

fix: remove all containers on stop to prevent name conflicts #4859

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
kallebysantos merged 6 commits into from
Apr 8, 2026
Merged

fix: remove all containers on stop to prevent name conflicts #4859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c51a537
fix: remove all containers on stop to prevent name conflicts
7ttp Feb 15, 2026
140bc71
Merge branch 'develop' into fix/stop
7ttp Mar 10, 2026
a638d28
Merge branch 'develop' into fix/stop
avallete Apr 1, 2026
dae971c
Merge branch 'develop' into fix/stop
avallete Apr 1, 2026
5a531ce
nit
7ttp Apr 8, 2026
44c1700
Merge branch 'develop' into fix/stop
7ttp Apr 8, 2026
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
8 changes: 7 additions & 1 deletion internal/stop/stop_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ func TestStopCommand(t *testing.T) {

func TestStopServices(t *testing.T) {
t.Run("stops all services", func(t *testing.T) {
containers := []container.Summary{{ID: "c1", State: "running"}, {ID: "c2"}}
containers := []container.Summary{
{ID: "c1", State: "running"},
{ID: "c2", State: "exited"},
}
// Setup mock docker
require.NoError(t, apitest.MockDocker(utils.Docker))
defer gock.OffAll()
Expand All @@ -174,6 +177,9 @@ func TestStopServices(t *testing.T) {
gock.New(utils.Docker.DaemonHost()).
Post("/v" + utils.Docker.ClientVersion() + "/containers/" + containers[0].ID + "/stop").
Reply(http.StatusOK)
gock.New(utils.Docker.DaemonHost()).
Post("/v" + utils.Docker.ClientVersion() + "/containers/" + containers[1].ID + "/stop").
Reply(http.StatusNotModified)
gock.New(utils.Docker.DaemonHost()).
Post("/v" + utils.Docker.ClientVersion() + "/containers/prune").
Reply(http.StatusOK).
Expand Down
6 changes: 2 additions & 4 deletions internal/utils/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ func DockerRemoveAll(ctx context.Context, w io.Writer, projectId string) error {
// Gracefully shutdown containers
var ids []string
for _, c := range containers {
if c.State == "running" {
ids = append(ids, c.ID)
}
ids = append(ids, c.ID)
}
result := WaitAll(ids, func(id string) error {
if err := Docker.ContainerStop(ctx, id, container.StopOptions{}); err != nil {
if err := Docker.ContainerStop(ctx, id, container.StopOptions{}); err != nil && !errdefs.IsNotModified(err) {
return errors.Errorf("failed to stop container: %w", err)
}
return nil
Expand Down
Loading