Yong Tang 955f123fe8 Fix ulimits in docker inspect when daemon default exists ...

This fix tries to fix 26326 where `docker inspect` will not show
ulimit even when daemon default ulimit has been set.

This fix merge the HostConfig's ulimit with daemon default in
`docker inspect`, so that when daemon is started with `default-ulimit`
and HostConfig's ulimit is not set, `docker inspect` will output
the daemon default.

An integration test has been added to cover the changes.

This fix fixes 26326.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7d705a7355d650feffc966e08efc0f92297145a8
Component: engine

2016-09-07 23:15:22 -07:00

..

caps

…

cluster

Move engine-api client package

2016-09-07 11:05:58 -07:00

events

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

exec

…

graphdriver

devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced

2016-09-07 14:03:01 -04:00

links

…

logger

Merge pull request #24586 from farcaller/gcplogs

2016-09-08 13:47:48 +10:00

network

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

apparmor_default_unsupported.go

…

apparmor_default.go

…

archive_unix.go

…

archive_windows.go

…

archive.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

attach.go

…

auth.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

changes.go

…

commit.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

config_experimental.go

…

config_solaris.go

…

config_stub.go

…

config_test.go

…

config_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

config_windows.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

config.go

…

container_operations_solaris.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

container_operations_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

container_operations_windows.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

container_operations.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

container.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

create_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

create_windows.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

create.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_experimental.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_linux_test.go

…

daemon_linux.go

…

daemon_solaris.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_stub.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_unix_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon_unsupported.go

…

daemon_windows.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

daemon.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

debugtrap_unix.go

…

debugtrap_unsupported.go

…

debugtrap_windows.go

…

delete_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

delete.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

discovery_test.go

validate heartbeat in discovery cluster opts

2016-09-01 01:07:05 +08:00

discovery.go

validate heartbeat in discovery cluster opts

2016-09-01 01:07:05 +08:00

errors.go

…

events_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

events.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

exec_linux.go

…

exec_solaris.go

…

exec_windows.go

…

exec.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

export.go

…

health_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

health.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

image_delete.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

image_exporter.go

…

image_history.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

image_inspect.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

image_pull.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

image_push.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

image_tag.go

…

image.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

images.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

import.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

info.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

inspect_solaris.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

inspect_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

inspect_windows.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

inspect.go

Fix ulimits in docker inspect when daemon default exists

2016-09-07 23:15:22 -07:00

keys_unsupported.go

…

keys.go

…

kill.go

…

links_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

links.go

…

list_unix.go

…

list_windows.go

…

list.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

logdrivers_linux.go

…

logdrivers_windows.go

…

logs_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

logs.go

Move engine-api client package

2016-09-07 11:05:58 -07:00

monitor_linux.go

…

monitor_solaris.go

…

monitor_windows.go

…

monitor.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

mounts.go

…

names.go

…

network.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

oci_linux.go

Fix ulimits in docker inspect when daemon default exists

2016-09-07 23:15:22 -07:00

oci_solaris.go

Fix ulimits in docker inspect when daemon default exists

2016-09-07 23:15:22 -07:00

oci_windows.go

Fix ulimits in docker inspect when daemon default exists

2016-09-07 23:15:22 -07:00

pause.go

…

rename.go

…

resize.go

…

restart.go

…

search_test.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

search.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

seccomp_disabled.go

…

seccomp_linux.go

New seccomp format

2016-09-01 11:53:07 +02:00

seccomp_unsupported.go

…

selinux_linux.go

…

selinux_unsupported.go

…

start_linux.go

…

start_windows.go

…

start.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

stats_collector_solaris.go

…

stats_collector_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

stats_collector_windows.go

…

stats.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

stop.go

…

top_unix_test.go

…

top_unix.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

top_windows.go

Windows: docker top implementation

2016-09-07 16:29:02 -07:00

unpause.go

remove running judgement when unpause container

2016-08-29 10:16:18 +08:00

update_linux.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

update_solaris.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

update_windows.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

update.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

volumes_unit_test.go

…

volumes_unix.go

Merge pull request #26342 from cpuguy83/20079_restore_volume_migrate

2016-09-07 10:56:07 -07:00

volumes_windows.go

…

volumes.go

Add engine-api types to docker

2016-09-07 11:05:58 -07:00

wait.go

…