summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorTheFox0x7 <thefox0x7@gmail.com>2023-08-11 07:33:53 +0200
committerGitHub <noreply@github.com>2023-08-11 07:33:53 +0200
commit9f06ca75e447f5fa08de31d2e2577d703df86cc1 (patch)
tree8d4544e68555f322f162e6a62c804d31794d4563 /cmd
parentFix "Unknown server OS" for Docker container `--device` option (#1957) (diff)
downloadforgejo-act-9f06ca75e447f5fa08de31d2e2577d703df86cc1.tar.xz
forgejo-act-9f06ca75e447f5fa08de31d2e2577d703df86cc1.zip
change podman socket path (#1961)
add podman user socket Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/root.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/root.go b/cmd/root.go
index 679d20e..43a5ae4 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -124,9 +124,10 @@ func configLocations() []string {
var commonSocketPaths = []string{
"/var/run/docker.sock",
- "/var/run/podman/podman.sock",
+ "/run/podman/podman.sock",
"$HOME/.colima/docker.sock",
"$XDG_RUNTIME_DIR/docker.sock",
+ "$XDG_RUNTIME_DIR/podman/podman.sock",
`\\.\pipe\docker_engine`,
"$HOME/.docker/run/docker.sock",
}