Skip to content

Apply autoremove on container instance, for better lifecycle management #538

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
0405ysj merged 1 commit into from
Aug 5, 2026
Merged

Apply autoremove on container instance, for better lifecycle management #538

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions pkg/app/instances/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,17 @@ func (m *DockerInstanceManager) waitCreateHostOperation(host string) (*apiv1.Hos
func (m *DockerInstanceManager) waitDeleteHostOperation(host string) (*apiv1.HostInstance, error) {
ctx, cancel := context.WithTimeout(context.TODO(), 3*time.Minute)
defer cancel()
resCh, errCh := m.Client.ContainerWait(ctx, host, "")
if _, err := m.Client.ContainerInspect(ctx, host); err != nil && errdefs.IsNotFound(err) {
return &apiv1.HostInstance{Name: host}, nil
}
resCh, errCh := m.Client.ContainerWait(ctx, host, container.WaitConditionRemoved)
select {
case <-ctx.Done():
return nil, errors.NewServiceUnavailableError("Wait for operation timed out", nil)
case err := <-errCh:
if errdefs.IsNotFound(err) {
return &apiv1.HostInstance{Name: host}, nil
}
return nil, fmt.Errorf("error is thrown while waiting for deleting host: %w", err)
case <-resCh:
return &apiv1.HostInstance{
Expand Down Expand Up @@ -400,7 +406,8 @@ func (m *DockerInstanceManager) createDockerContainer(ctx context.Context, user
Labels: dockerLabelsDict(user),
}
hostConfig := &container.HostConfig{
CapAdd: []string{"NET_ADMIN"},
AutoRemove: true,
CapAdd: []string{"NET_ADMIN"},
Mounts: []mount.Mount{
{
Type: mount.TypeVolume,
Expand Down Expand Up @@ -467,9 +474,6 @@ func (m *DockerInstanceManager) deleteDockerContainer(ctx context.Context, user
if err := m.Client.ContainerStop(ctx, host, container.StopOptions{}); err != nil {
return fmt.Errorf("failed to stop docker container: %w", err)
}
if err := m.Client.ContainerRemove(ctx, host, container.RemoveOptions{}); err != nil {
return fmt.Errorf("failed to remove docker container: %w", err)
}
return nil
}

Expand Down
Loading