Lei Jitang 83fbaa3cb4 Fix restore active sandbox ...

we store the active sandbox after daemon.containerd.Restore, but there
is a chance the `Restore` will set the container to exit see
(https://github.com/docker/docker/blob/master/libcontainerd/client_linux.go#L469).
so we should check if the container is really running before add it to
activesandbox.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 78f3094518b1f3f498bd2629667877f9a87d452f)

2016-06-16 23:36:56 -07:00

..

caps

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

cluster

use same hash for same secret

2016-06-16 23:36:55 -07:00

events

Add filter for events emitted by docker daemon

2016-05-23 19:00:47 -07:00

exec

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

graphdriver

Add ecryptfs check for overlay2

2016-06-16 23:36:55 -07:00

links

…

logger

Merge pull request #23063 from yongtang/22961-aws-sdk-go

2016-06-05 16:01:52 -04:00

network

Add Swarm management backend

2016-06-13 22:16:18 -07:00

apparmor_default_unsupported.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

apparmor_default.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

archive_unix.go

Windows: docker cp consistent paths

2016-05-06 16:08:53 -07:00

archive_windows.go

Windows: Remove TP4 support from main code

2016-04-06 12:12:20 -07:00

archive.go

Windows: docker cp consistent paths

2016-05-06 16:08:53 -07:00

attach.go

Merge pull request #22777 from WeiZhang555/wait-restarting

2016-06-12 13:01:20 +02:00

auth.go

Moving some more methods away from daemon.go

2016-05-27 11:32:26 +02:00

changes.go

Move some container related methods and structs to smaller files

2016-05-24 21:31:15 +02:00

commit.go

Add support for user-defined healthchecks

2016-06-02 23:58:34 +02:00

config_experimental.go

…

config_solaris.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

config_stub.go

…

config_test.go

Add support for multiples runtimes

2016-06-14 07:47:31 -07:00

config_unix.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

config_windows.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

config.go

Add support for multiples runtimes

2016-06-14 07:47:31 -07:00

container_operations_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

container_operations_unix.go

Add support for --pid=container:<id>

2016-05-17 13:49:05 -04:00

container_operations_windows.go

Merge pull request #21809 from Microsoft/jjh/tp4removal

2016-04-06 14:11:33 -07:00

container_operations.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

container.go

Add Swarm management backend

2016-06-13 22:16:18 -07:00

create_unix.go

Merge pull request #21270 from ehazlett/resource-labels

2016-03-22 15:12:33 -04:00

create_windows.go

Windows: Default isolation and workdir

2016-05-26 13:24:22 -07:00

create.go

Add Swarm management backend

2016-06-13 22:16:18 -07:00

daemon_experimental.go

…

daemon_linux_test.go

Fix container mount cleanup issues

2016-03-30 17:25:49 -07:00

daemon_linux.go

Fix container mount cleanup issues

2016-03-30 17:25:49 -07:00

daemon_solaris.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

daemon_stub.go

…

daemon_test.go

Wait for discovery on container start error

2016-05-11 09:49:51 -04:00

daemon_unix_test.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

daemon_unix.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

daemon_unsupported.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

daemon_windows.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

daemon.go

Fix restore active sandbox

2016-06-16 23:36:56 -07:00

debugtrap_unix.go

…

debugtrap_unsupported.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

debugtrap_windows.go

Windows: psignal alias not required

2016-03-27 17:23:34 -07:00

delete_test.go

…

delete.go

Merge pull request #21802 from tiborvass/carry-21716

2016-04-06 15:21:38 -04:00

discovery_test.go

…

discovery.go

Wait for discovery on container start error

2016-05-11 09:49:51 -04:00

errors.go

…

events_test.go

…

events.go

Add filter for events emitted by docker daemon

2016-05-23 19:00:47 -07:00

exec_linux.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

exec_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

exec_windows.go

Windows: escape entrypoint before passing to libcontainerd

2016-03-30 12:59:50 -07:00

exec.go

Fix logrus formatting

2016-06-11 13:16:55 -07:00

export.go

…

health_test.go

Add support for user-defined healthchecks

2016-06-02 23:58:34 +02:00

health.go

Merge pull request #23442 from thaJeztah/remove-defaultExitOnUnhealthy

2016-06-11 16:37:39 -07:00

image_delete.go

…

image_exporter.go

Move some image related methods & struct to smaller files

2016-05-21 22:36:11 +02:00

image_history.go

Move some image related methods & struct to smaller files

2016-05-21 22:36:11 +02:00

image_inspect.go

Move some image related methods & struct to smaller files

2016-05-21 22:36:11 +02:00

image_pull.go

Remove reference package dependency from the api.

2016-04-07 15:01:23 -07:00

image_push.go

Remove reference package dependency from the api.

2016-04-07 15:01:23 -07:00

image_tag.go

Remove reference package dependency from the api.

2016-04-07 15:01:23 -07:00

image.go

Move some image related methods & struct to smaller files

2016-05-21 22:36:11 +02:00

images.go

Add before and since filter to images

2016-05-25 13:49:10 +02:00

import.go

Remove reference package dependency from the api.

2016-04-07 15:01:23 -07:00

info.go

Add support for multiples runtimes

2016-06-14 07:47:31 -07:00

inspect_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

inspect_unix.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

inspect_windows.go

Add Swarm management backend

2016-06-13 22:16:18 -07:00

inspect.go

Fix race on force deleting container created by task

2016-06-14 16:49:04 -07:00

kill.go

*: fix logrus.Warn[f]

2016-06-11 19:42:38 +02:00

links_test.go

…

links.go

…

list_unix.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

list_windows.go

…

list.go

Fixes #23596-returns empty string for NetworkID in response to /containers/json

2016-06-16 23:36:55 -07:00

logdrivers_linux.go

…

logdrivers_windows.go

…

logs.go

Fix logrus formatting

2016-06-11 13:16:55 -07:00

monitor_linux.go

Adding postRunProcessing infrastructure for hanlding Windows Update.

2016-04-06 14:03:05 -07:00

monitor_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

monitor_windows.go

Fix race on force deleting container created by task

2016-06-14 16:49:04 -07:00

monitor.go

Add support for user-defined healthchecks

2016-06-02 23:58:34 +02:00

mounts.go

…

names.go

Moving some more methods away from daemon.go

2016-05-27 11:32:26 +02:00

network.go

Daemon to support network restore

2016-06-14 16:45:25 -07:00

oci_linux.go

daemon: allow tmpfs to trump over VOLUME(s)

2016-06-16 23:36:51 -07:00

oci_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

oci_windows.go

Windows: Use image version, not OS version for TTY fixup

2016-05-25 12:22:52 -07:00

pause.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

rename.go

Embedded DNS problem after renaming container. Step2:change in docker/daemon side and add integration test

2016-05-26 12:59:44 +08:00

resize.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

restart.go

…

search_test.go

Add --limit option to docker search

2016-06-02 19:12:20 -07:00

search.go

Add --limit option to docker search

2016-06-02 19:12:20 -07:00

seccomp_disabled.go

Error out if user tries to specify a custom seccomp profile on system that does not support it

2016-05-31 17:52:40 +01:00

seccomp_linux.go

Align default seccomp profile with selected capabilities

2016-05-11 09:30:23 +01:00

selinux_linux.go

…

selinux_unsupported.go

…

start_linux.go

Add support for multiples runtimes

2016-06-14 07:47:31 -07:00

start_windows.go

Add support for multiples runtimes

2016-06-14 07:47:31 -07:00

start.go

Fix race on force deleting container created by task

2016-06-14 16:49:04 -07:00

stats_collector_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

stats_collector_unix.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

stats_collector_windows.go

…

stats.go

cleanup: clean up commented code in daemon/stats.go

2016-06-02 14:39:12 +08:00

stop.go

Add support for user-defined healthchecks

2016-06-02 23:58:34 +02:00

top_unix.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

top_windows.go

Windows: Minimal docker top implementation

2016-03-20 16:45:53 -07:00

unpause.go

Replace execdrivers with containerd implementation

2016-03-18 13:38:32 -07:00

update_linux.go

Update containerd and runc vendoring

2016-06-14 07:47:31 -07:00

update_solaris.go

Get the Docker Engine to build clean on Solaris

2016-05-23 16:37:12 -07:00

update_windows.go

Windows libcontainerd implementation

2016-03-18 13:38:41 -07:00

update.go

Remove WaitRunning

2016-04-27 11:36:47 +08:00

volumes_unit_test.go

…

volumes_unix.go

daemon: allow tmpfs to trump over VOLUME(s)

2016-06-16 23:36:51 -07:00

volumes_windows.go

Remove unneeded references to execDriver

2016-03-21 13:06:08 -07:00

volumes.go

daemon: allow tmpfs to trump over VOLUME(s)

2016-06-16 23:36:51 -07:00

wait.go

Fix race on force deleting container created by task

2016-06-14 16:49:04 -07:00