diff --git a/app/cmd/docker/logs.go b/app/cmd/docker/logs.go index 6d63c1b..ae3835a 100644 --- a/app/cmd/docker/logs.go +++ b/app/cmd/docker/logs.go @@ -16,7 +16,7 @@ var CmdComposeLogs = cli.Command{ func RunComposeLogs(cmd *cli.Context) error { ctx := context.InitCommand(cmd) - compose.ExecComposerLogs(ctx) + compose.ExecComposerLogs(ctx, cmd.Args()) return nil } diff --git a/app/cmd/docker/up.go b/app/cmd/docker/up.go index 15c39d3..4196b78 100644 --- a/app/cmd/docker/up.go +++ b/app/cmd/docker/up.go @@ -17,6 +17,7 @@ var CmdDockerUp = cli.Command{ func RunComposeUp(cmd *cli.Context) error { ctx := context.InitCommand(cmd) compose.ExecComposerUp(ctx) + compose.ExecComposerLogs(ctx, cmd.Args()) return nil } diff --git a/app/modules/compose/compose.go b/app/modules/compose/compose.go index f6b368d..c0c589a 100644 --- a/app/modules/compose/compose.go +++ b/app/modules/compose/compose.go @@ -18,6 +18,7 @@ import ( const DockerComposeVersion = ">= 1.28.6" func CheckDockerComposeVersion() { + // cmd := exec.Command("docker-compose", "--version") cmd := exec.Command("docker-compose", "--version") var output bytes.Buffer cmd.Stdout = &output @@ -124,9 +125,10 @@ func ExecComposerRestart(ctx *context.LedoContext) { ctx.ExecCmd("docker-compose", args[0:]) } -func ExecComposerLogs(ctx *context.LedoContext) { +func ExecComposerLogs(ctx *context.LedoContext, command cli.Args) { args := ctx.ComposeArgs args = append(args, "logs", "--follow", "--tail", "100") + args = append(args, command.Slice()...) ctx.ExecCmd("docker-compose", args[0:]) } diff --git a/main.go b/main.go index aa2472c..b185e63 100644 --- a/main.go +++ b/main.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/urfave/cli/v2" "ledo/app/cmd" + "ledo/app/modules/compose" "os" ) @@ -13,6 +14,7 @@ var ( func main() { app := cli.NewApp() + compose.CheckDockerComposeVersion() app.Name = "ledo" app.Usage = "LeadDocker helper for docker-compose work" app.Description = appDescription