Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c4f0d7be8e |
@@ -5,6 +5,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -207,8 +208,14 @@ func (p *Podman) Logs(ctx context.Context, containerName string, tail int, follo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// journalLogs returns a journalctl command filtered by container name.
|
// journalLogs returns a journalctl command filtered by container name.
|
||||||
|
// For rootless podman, container logs go to the user journal, so we
|
||||||
|
// need --user to read them.
|
||||||
func (p *Podman) journalLogs(ctx context.Context, containerName string, tail int, follow bool, since string) *exec.Cmd {
|
func (p *Podman) journalLogs(ctx context.Context, containerName string, tail int, follow bool, since string) *exec.Cmd {
|
||||||
args := []string{"--no-pager", "--output", "cat", "CONTAINER_NAME=" + containerName}
|
args := []string{"--no-pager", "--output", "cat"}
|
||||||
|
if os.Getuid() != 0 {
|
||||||
|
args = append(args, "--user")
|
||||||
|
}
|
||||||
|
args = append(args, "CONTAINER_NAME="+containerName)
|
||||||
if tail > 0 {
|
if tail > 0 {
|
||||||
args = append(args, "--lines", fmt.Sprintf("%d", tail))
|
args = append(args, "--lines", fmt.Sprintf("%d", tail))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user