Revert "Fix inconsistent date formats in API"

This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
This commit is contained in:
Victor Vieux
2015-05-14 17:31:34 -07:00
parent 5edd0d62d2
commit 56ea157723
10 changed files with 22 additions and 135 deletions

View File

@ -151,7 +151,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {
}
fmt.Fprintf(w, "%s\t%s\t%s\t%s ago\t%s\t%s\t%s\t", ID, image, command,
units.HumanDuration(time.Now().UTC().Sub(container.Created)),
units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(container.Created), 0))),
container.Status, api.DisplayablePorts(container.Ports), strings.Join(names, ","))
if *size {