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.

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

Jump to bottom

Fix podman agent container in v2 #2897

Merged
merged 3 commits into from
Dec 2, 2023
Merged

Fix podman agent container in v2 #2897

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68f7254
Fix podman agent container in v2
kaylynb Dec 1, 2023
9f3cc2e
Merge branch 'main' into podman-container-kill
qwerty287 Dec 2, 2023
57a2421
Merge branch 'main' into podman-container-kill
qwerty287 Dec 2, 2023
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
3 changes: 2 additions & 1 deletion pipeline/backend/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,9 @@
func isErrContainerNotFoundOrNotRunning(err error) bool {
// Error response from daemon: Cannot kill container: ...: No such container: ...
// Error response from daemon: Cannot kill container: ...: Container ... is not running"
// Error response from podman daemon: can only kill running containers. ... is in state exited

Check warning on line 364 in pipeline/backend/docker/docker.go

View check run for this annotation

Codecov / codecov/patch

pipeline/backend/docker/docker.go#L364 

Added line #L364 was not covered by tests
// Error: No such container: ...
return err != nil && (strings.Contains(err.Error(), "No such container") || strings.Contains(err.Error(), "is not running"))
return err != nil && (strings.Contains(err.Error(), "No such container") || strings.Contains(err.Error(), "is not running") || strings.Contains(err.Error(), "can only kill running containers"))

Check warning on line 366 in pipeline/backend/docker/docker.go

View check run for this annotation

Codecov / codecov/patch

pipeline/backend/docker/docker.go#L366 

Added line #L366 was not covered by tests
}

// normalizeArchType converts the arch type reported by docker info into
Expand Down