Skip to content

Commit 8f14db8

Browse files
authored
Merge pull request #2555 from devisions/timestam_with_z_doc_upd
Explicit Z on logs timestamp examples
2 parents 82de74a + 1183a3e commit 8f14db8

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

cli/command/container/logs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func NewLogsCommand(dockerCli command.Cli) *cobra.Command {
3838

3939
flags := cmd.Flags()
4040
flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output")
41-
flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37) or relative (e.g. 42m for 42 minutes)")
42-
flags.StringVar(&opts.until, "until", "", "Show logs before a timestamp (e.g. 2013-01-02T13:23:37) or relative (e.g. 42m for 42 minutes)")
41+
flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)")
42+
flags.StringVar(&opts.until, "until", "", "Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)")
4343
flags.SetAnnotation("until", "version", []string{"1.35"})
4444
flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps")
4545
flags.BoolVar(&opts.details, "details", false, "Show extra details provided to logs")

cli/command/service/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func newLogsCommand(dockerCli command.Cli) *cobra.Command {
5959
flags.BoolVar(&opts.noTaskIDs, "no-task-ids", false, "Do not include task IDs in output")
6060
// options identical to container logs
6161
flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output")
62-
flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37) or relative (e.g. 42m for 42 minutes)")
62+
flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)")
6363
flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps")
6464
flags.BoolVar(&opts.details, "details", false, "Show extra details provided to logs")
6565
flags.SetAnnotation("details", "version", []string{"1.30"})

docs/reference/commandline/logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Options:
1515
--details Show extra details provided to logs
1616
-f, --follow Follow log output
1717
--help Print usage
18-
--since string Show logs since timestamp (e.g. 2013-01-02T13:23:37) or relative (e.g. 42m for 42 minutes)
19-
--until string Show logs before timestamp (e.g. 2013-01-02T13:23:37) or relative (e.g. 42m for 42 minutes)
18+
--since string Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)
19+
--until string Show logs before timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)
2020
--tail string Number of lines to show from the end of the logs (default "all")
2121
-t, --timestamps Show timestamps
2222
```

0 commit comments

Comments
 (0)