github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove gogoproto.stdtime

Browse Source 
This commit removes gogoproto.stdtime, since it is not supported by
Google's official toolchain
(see https://github.com/containerd/containerd/issues/6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-18 22:12:15 +00:00
parent 26a3ab446b
commit 80b825ca2c
71 changed files with 1803 additions and 1594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
task.go
View File

@@ -265,7 +265,7 @@ func (t *task) Status(ctx context.Context) (Status, error) {
return Status{
Status: ProcessStatus(strings.ToLower(r.Process.Status.String())),
ExitStatus: r.Process.ExitStatus,
ExitTime: r.Process.ExitedAt,
ExitTime: protobuf.FromTimestamp(r.Process.ExitedAt),
}, nil
}
@@ -285,7 +285,7 @@ func (t *task) Wait(ctx context.Context) (<-chan ExitStatus, error) {
}
c <- ExitStatus{
code: r.ExitStatus,
exitedAt: r.ExitedAt,
exitedAt: protobuf.FromTimestamp(r.ExitedAt),
}
}()
return c, nil
@@ -330,7 +330,7 @@ func (t *task) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (*ExitStat
if t.io != nil {
t.io.Close()
}
return &ExitStatus{code: r.ExitStatus, exitedAt: r.ExitedAt}, nil
return &ExitStatus{code: r.ExitStatus, exitedAt: protobuf.FromTimestamp(r.ExitedAt)}, nil
}
func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreate cio.Creator) (_ Process, err error) {