1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/daemon
Yong Tang 7d705a7355 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>
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.go
apparmor_default_unsupported.go
archive.go Add engine-api types to docker 2016-09-07 11:05:58 -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
attach.go Merge pull request #22777 from WeiZhang555/wait-restarting 2016-06-12 13:01:20 +02:00
auth.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
changes.go Move some container related methods and structs to smaller files 2016-05-24 21:31:15 +02:00
commit.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
config.go Remove old cli framework. 2016-08-25 13:09:04 -04:00
config_experimental.go Convert dockerd to use cobra and pflag 2016-08-25 13:09:03 -04:00
config_solaris.go Convert dockerd to use cobra and pflag 2016-08-25 13:09:03 -04:00
config_stub.go Convert dockerd to use cobra and pflag 2016-08-25 13:09:03 -04:00
config_test.go Update unit tests for new cobra root command. 2016-08-25 13:09:04 -04:00
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
container.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_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
create.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
daemon.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.go Fix container mount cleanup issues 2016-03-30 17:25:49 -07:00
daemon_linux_test.go Fix container mount cleanup issues 2016-03-30 17:25:49 -07:00
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.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_unsupported.go Get the Docker Engine to build clean on Solaris 2016-05-23 16:37:12 -07:00
daemon_windows.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
debugtrap_unix.go Windows: Stack dump to file 2016-07-21 20:04:47 -07:00
debugtrap_unsupported.go Windows: Stack dump to file 2016-07-21 20:04:47 -07:00
debugtrap_windows.go Windows: Stack dump to file 2016-07-21 20:04:47 -07:00
delete.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
delete_test.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
discovery.go validate heartbeat in discovery cluster opts 2016-09-01 01:07:05 +08:00
discovery_test.go validate heartbeat in discovery cluster opts 2016-09-01 01:07:05 +08:00
errors.go
events.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
events_test.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
exec.go Add engine-api types to docker 2016-09-07 11:05:58 -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 Windows: escape entrypoint before passing to libcontainerd 2016-03-30 12:59:50 -07:00
export.go
health.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
health_test.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
image.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 Move some image related methods & struct to smaller files 2016-05-21 22:36:11 +02:00
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 Remove reference package dependency from the api. 2016-04-07 15:01:23 -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.go Fix ulimits in docker inspect when daemon default exists 2016-09-07 23:15:22 -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
keys.go Change root_maxkeys 2016-06-27 10:23:37 -07:00
keys_unsupported.go Change root_maxkeys 2016-06-27 10:23:37 -07:00
kill.go make container kill debug log readable 2016-08-01 01:00:38 +08:00
links.go
links_test.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
list.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
list_unix.go Get the Docker Engine to build clean on Solaris 2016-05-23 16:37:12 -07:00
list_windows.go
logdrivers_linux.go
logdrivers_windows.go Enable syslog driver for windows 2016-08-17 22:26:24 +02:00
logs.go Move engine-api client package 2016-09-07 11:05:58 -07:00
logs_test.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
monitor.go Add engine-api types to docker 2016-09-07 11:05:58 -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
mounts.go
names.go Added the word "container" to clarify the error message. 2016-08-22 13:41:17 -07:00
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 Fix docker rename with linked containers 2016-06-27 19:58:05 -07:00
resize.go
restart.go Optimize the restart function code 2016-08-26 14:22:39 +08:00
search.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
search_test.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
seccomp_disabled.go Replace old oci specs import with runtime-specs 2016-08-17 09:38:34 -07:00
seccomp_linux.go New seccomp format 2016-09-01 11:53:07 +02:00
seccomp_unsupported.go Fix seccomp output in docker info 2016-07-08 17:26:42 -07:00
selinux_linux.go
selinux_unsupported.go
start.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
start_linux.go daemon: ensure systemd cgroup is passed down to runtimes 2016-08-26 15:33:26 +02:00
start_windows.go Add support for multiples runtimes 2016-06-14 07:47:31 -07:00
stats.go Add engine-api types to docker 2016-09-07 11:05:58 -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 Add engine-api types to docker 2016-09-07 11:05:58 -07:00
stats_collector_windows.go
stop.go Add support for user-defined healthchecks 2016-06-02 23:58:34 +02:00
top_unix.go Add engine-api types to docker 2016-09-07 11:05:58 -07:00
top_unix_test.go Validate arguments for ps in docker top 2016-07-08 05:58:11 +00: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.go Add engine-api types to docker 2016-09-07 11:05:58 -07: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
volumes.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
wait.go Fix race on force deleting container created by task 2016-06-14 16:49:04 -07:00