Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c4f0d7be8e | |||
| 4d900eafd1 | |||
| 38f9070c24 | |||
| 67d0ab1d9d |
12
cmd/mcp/edit.go
Normal file
12
cmd/mcp/edit.go
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "github.com/spf13/cobra"
|
||||||
|
|
||||||
|
func editCmd() *cobra.Command {
|
||||||
|
return &cobra.Command{
|
||||||
|
Use: "edit <service>",
|
||||||
|
Short: "Open service definition in $EDITOR",
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
RunE: runServiceEdit,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -51,6 +51,7 @@ func main() {
|
|||||||
root.AddCommand(nodeCmd())
|
root.AddCommand(nodeCmd())
|
||||||
root.AddCommand(purgeCmd())
|
root.AddCommand(purgeCmd())
|
||||||
root.AddCommand(logsCmd())
|
root.AddCommand(logsCmd())
|
||||||
|
root.AddCommand(editCmd())
|
||||||
|
|
||||||
if err := root.Execute(); err != nil {
|
if err := root.Execute(); err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
version = "0.6.0";
|
version = pkgs.lib.removePrefix "v" (self.gitDescribe or self.shortRev or self.dirtyShortRev or "unknown");
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
|
|||||||
@@ -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