Vincent Demeester f966aae6ae Merge pull request #29150 from vieux/cherry_28026 ...

[1.12.x]  a few cherry-picks

2016-12-06 10:17:23 +01:00

..

caps

…

cluster

cluster: Refuse swarm spec not named "default"

2016-12-05 14:54:51 -08:00

events

Make daemon events listen for plugin lifecycle events.

2016-08-11 17:56:43 -07:00

exec

Small log formatting fixes

2016-12-02 18:10:25 -08:00

graphdriver

Add retry logic during aufs unmount.

2016-09-26 19:35:12 -07:00

links

…

logger

daemon/logger: fix races in channel close

2016-06-30 17:11:13 -07:00

network

Add Swarm management backend

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

apparmor_default_unsupported.go

…

apparmor_default.go

…

archive_unix.go

Windows: docker cp consistent paths

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

archive_windows.go

…

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 changes to pass exec-root to libnetwork

2016-07-25 23:18:14 -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 changes to pass exec-root to libnetwork

2016-07-25 23:18:14 -07:00

config_windows.go

Daemon changes to pass exec-root to libnetwork

2016-07-25 23:18:14 -07:00

config.go

Split advertised address from listen address

2016-07-25 23:18:03 -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

…

container_operations.go

Fix regression on --link on bridge network

2016-07-25 23:17:08 -07:00

container.go

Remove hostname validation as it seems to break users

2016-11-30 19:21:28 +01:00

create_unix.go

…

create_windows.go

Windows: Default isolation and workdir

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

create.go

Remove hostname validation as it seems to break users

2016-11-30 19:21:28 +01:00

daemon_experimental.go

Make daemon events listen for plugin lifecycle events.

2016-08-11 17:56:43 -07:00

daemon_linux_test.go

…

daemon_linux.go

…

daemon_solaris.go

Add --oom-score-adjust to daemon

2016-07-25 23:14:57 -07:00

daemon_stub.go

Make daemon events listen for plugin lifecycle events.

2016-08-11 17:56:43 -07:00

daemon_test.go

fix typos

2016-07-25 23:18:15 -07:00

daemon_unix_test.go

Daemon to support network restore

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

daemon_unix.go

Vendor in new containerd

2016-07-25 23:15:42 -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

Add --oom-score-adjust to daemon

2016-07-25 23:14:57 -07:00

daemon.go

Move stdio attach from libcontainerd backend to callback

2016-12-02 18:09:10 -08: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

…

delete_test.go

fix typos

2016-07-25 23:18:15 -07:00

delete.go

…

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

Make daemon events listen for plugin lifecycle events.

2016-08-11 17:56:43 -07:00

exec_linux.go

…

exec_solaris.go

Get the Docker Engine to build clean on Solaris

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

exec_windows.go

…

exec.go

Move stdio attach from libcontainerd backend to callback

2016-12-02 18:09:10 -08:00

export.go

…

health_test.go

healthcheck: do not interpret exit code 2 as "starting"

2016-07-25 23:24:47 -07:00

health.go

Reset health status to starting when a container is restarted

2016-10-20 11:36:43 -07:00

image_delete.go

Fix untag without force while container running

2016-07-26 01:53:17 -07:00

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

…

image_push.go

…

image_tag.go

…

image.go

Move some image related methods & struct to smaller files

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

images.go

Treat digest only images as dangling

2016-07-08 15:32:14 -07:00

import.go

…

info.go

Fix panic when meminfo couldn't be read

2016-07-12 15:50:38 -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

keys_unsupported.go

Change root_maxkeys

2016-06-30 16:47:52 -07:00

keys.go

Change root_maxkeys

2016-06-30 16:47:52 -07:00

kill.go

fix typos

2016-07-25 23:18:15 -07: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

Check for non-nil container after match

2016-09-26 19:33:23 -07:00

logdrivers_linux.go

…

logdrivers_windows.go

…

logs_test.go

Fix panic while merging log configs to nil map

2016-07-12 15:50:38 -07:00

logs.go

Move stdio attach from libcontainerd backend to callback

2016-12-02 18:09:10 -08:00

monitor_linux.go

…

monitor_solaris.go

Get the Docker Engine to build clean on Solaris

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

monitor_windows.go

Move stdio attach from libcontainerd backend to callback

2016-12-02 18:09:10 -08:00

monitor.go

Move stdio attach from libcontainerd backend to callback

2016-12-02 18:09:10 -08:00

mounts.go

…

names.go

Moving some more methods away from daemon.go

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

network.go

Handle ingress sbox creation gracefully

2016-07-25 23:14:57 -07:00

oci_linux.go

Fix misspell typos

2016-06-30 16:47:43 -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

…

rename.go

No need for container.Lock if rename same name

2016-06-30 16:47:49 -07:00

resize.go

…

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

Fix seccomp output in docker info

2016-07-12 15:43:38 -07:00

seccomp_linux.go

Fix seccomp output in docker info

2016-07-12 15:43:38 -07:00

seccomp_unsupported.go

Fix seccomp output in docker info

2016-07-12 15:43:38 -07:00

selinux_linux.go

…

selinux_unsupported.go

…

start_linux.go

Update to new swarmkit/engine-api

2016-07-01 00:40:37 -07:00

start_windows.go

Add support for multiples runtimes

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

start.go

Move stdio attach from libcontainerd backend to callback

2016-12-02 18:09:10 -08: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

Return an empty stats if the container is restarting

2016-12-05 14:19:06 -08:00

stop.go

Add support for user-defined healthchecks

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

top_unix_test.go

Validate arguments for ps in docker top

2016-07-08 15:33:30 -07:00

top_unix.go

Validate arguments for ps in docker top

2016-07-08 15:33:30 -07:00

top_windows.go

…

unpause.go

…

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

…

update.go

Remove hostname validation as it seems to break users

2016-11-30 19:21:28 +01: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

…

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