github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix e2e tests.

Browse Source
This commit is contained in:
Dawn Chen
2014-10-03 16:25:54 -07:00
parent 39f648bda2
commit a86d496f9a
7 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/dockertools/docker.go
View File

@@ -293,8 +293,9 @@ func inspectContainer(client DockerInterface, dockerID, containerName string) (*
glog.V(3).Infof("Container: %s [%s] inspect result %+v", *inspectResult)
var containerStatus api.ContainerStatus
waiting := true
containerStatus.Image = inspectResult.Config.Image
waiting := true
if inspectResult.State.Running {
containerStatus.State.Running = &api.ContainerStateRunning{
StartedAt: inspectResult.State.StartedAt,