diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 83bb121da4..ebe670ebf1 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -118,7 +118,6 @@ func logsFlags(cmd *cobra.Command) { flags.BoolVarP(&logsOptions.Colors, "color", "", false, "Output the containers with different colors in the log.") flags.BoolVarP(&logsOptions.Names, "names", "n", false, "Output the container name in the log") - flags.SetInterspersed(false) _ = flags.MarkHidden("details") } diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go index 846f1997ad..56d3269fd9 100644 --- a/cmd/podman/pods/logs.go +++ b/cmd/podman/pods/logs.go @@ -92,7 +92,6 @@ func logsFlags(cmd *cobra.Command) { flags.BoolVarP(&logsPodOptions.Timestamps, "timestamps", "t", false, "Output the timestamps in the log") flags.BoolVarP(&logsPodOptions.Colors, "color", "", false, "Output the containers within a pod with different colors in the log") - flags.SetInterspersed(false) _ = flags.MarkHidden("details") } diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 9d2d551065..14b4388827 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -122,7 +122,9 @@ var _ = Describe("Podman logs", func() { Expect(wait).To(ExitCleanly()) Eventually(func(g Gomega) { - results := podmanTest.Podman([]string{"logs", "--tail", "99", name}) + // Options after name should work as well + // https://github.com/containers/podman/issues/25653 + results := podmanTest.Podman([]string{"logs", name, "--tail", "99"}) results.WaitWithDefaultTimeout() g.Expect(results).To(ExitCleanly()) g.Expect(results.OutputToStringArray()).To(HaveLen(3)) diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 9114346a5d..39de0ef782 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -341,7 +341,8 @@ function _log_test_follow_since() { sleep 0.2 # Make sure podman logs actually follows by giving a low timeout and check that the command times out - PODMAN_TIMEOUT=3 run_podman 124 ${events_backend} logs --since 0.1s -f $cname + # Option after container name should work as well: https://github.com/containers/podman/issues/25653 + PODMAN_TIMEOUT=3 run_podman 124 ${events_backend} logs --since 0.1s $cname -f assert "$output" =~ "$content timeout: sending signal TERM to command.*" "logs --since -f on running container works"