toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a483fc51feb26a304f8c350052d78dab9b5d6c2f
docker-cli/components/engine/daemon
History
Yong Tang a483fc51fe Docker inspect gave default log options even when the option is emtpy. 
This fix tries to addess the issue in #21956 where `docker inspect`
will overwrite the log config options with default option even when
the `--log-driver` is not empty and `--log-opt` is empty. In this
situation, `docker inspect` and `docker run` is different.

With the introduction of #21153, the `HostConfig` will always have
the correct log-driver and log-opt values.

However, the previous processing of `docker inspect` was not updated
after the change in #21153. This results in the incorrect behavior.

This fix addresses this issue by updating `docker inspect` to conform
to #21153 so the the behavior of `docker inspect` and `docker run` is
consistent.

A integration test has been added to cover this fix.

This fix fixes #21956. This fix is related to #21153.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4b5404f15ed2944ca2d994f52618338c52611352
Component: engine
2016-05-02 21:14:42 -07:00
..
caps
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
events
Get events until a time in the past.
2016-04-14 16:22:16 -07:00
exec
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
graphdriver
Merge pull request #21945 from rhvgoyal/export-min-free-space
2016-05-02 20:20:08 -04:00
links
Replace usage of pkg/nat with go-connections/nat.
2015-12-22 13:31:46 -05:00
logger
inherit the daemon log options when creating containers
2016-05-02 23:04:04 +08:00
network
Add "driver" filter for network ls
2016-04-29 16:22:26 +02: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
Remove package daemonbuilder.
2016-02-01 09:57:38 -08:00
archive_windows.go
Windows: Remove TP4 support from main code
2016-04-06 12:12:20 -07:00
archive.go
Fix copy chown settings to not default to real root
2016-02-18 14:44:13 -08:00
attach.go
Let client print error when speicify wrong detach keys
2016-04-04 15:35:55 +08:00
changes.go
Rename Daemon.Get to Daemon.GetContainer.
2015-12-11 12:39:28 -05:00
commit.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
config_experimental.go
Move userns support out of experimental into master
2016-01-08 15:06:22 -05:00
config_stub.go
…
config_test.go
add validating configs from configuration file
2016-03-16 00:05:52 +08:00
config_unix.go
1.move cors into common config
2016-04-25 10:52:13 +08:00
config_windows.go
Windows: bridgeConfig rework
2016-03-28 12:24:01 -07:00
config.go
1.move cors into common config
2016-04-25 10:52:13 +08:00
container_operations_unix.go
Relative symlinks don't work with --device argument
2016-04-25 07:22:56 -07:00
container_operations_windows.go
Merge pull request #21809 from Microsoft/jjh/tp4removal
2016-04-06 14:11:33 -07:00
container_operations.go
Add container's short-id as default network alias
2016-04-18 14:45:16 -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: Remove TP4 support from main code
2016-04-06 12:12:20 -07:00
create.go
inherit the daemon log options when creating containers
2016-05-02 23:04:04 +08:00
daemon_experimental.go
Move userns support out of experimental into master
2016-01-08 15:06:22 -05:00
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_stub.go
Move userns support out of experimental into master
2016-01-08 15:06:22 -05:00
daemon_test.go
fix reloading of daemon labels from config
2016-04-25 15:57:28 +02:00
daemon_unix_test.go
Consolidate security options to use = as separator.
2016-03-17 13:34:42 -04:00
daemon_unix.go
Simplify blkio resources setup in spec
2016-04-29 13:39:04 -07:00
daemon_unsupported.go
…
daemon_windows.go
Add IO Resource Controls for Windows
2016-04-25 13:07:29 -07:00
daemon.go
inherit the daemon log options when creating containers
2016-05-02 23:04:04 +08:00
debugtrap_unix.go
…
debugtrap_unsupported.go
…
debugtrap_windows.go
Windows: psignal alias not required
2016-03-27 17:23:34 -07:00
delete_test.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
delete.go
Merge pull request #21802 from tiborvass/carry-21716
2016-04-06 15:21:38 -04:00
discovery_test.go
Fix minor vet warnings
2016-02-03 10:43:01 -08:00
discovery.go
fix typos
2016-03-11 23:22:16 +08:00
errors.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
events_test.go
Add the possibility to log event with specific attributes
2016-01-17 12:14:01 +01:00
events.go
Fix wrong comment
2016-04-26 07:36:14 +00:00
exec_linux.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
exec_windows.go
Windows: escape entrypoint before passing to libcontainerd
2016-03-30 12:59:50 -07:00
exec.go
Update client code with api changes
2016-04-15 12:48:01 +02:00
export.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
image_delete.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05: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
images.go
Fix image filter
2016-01-14 08:17:40 +00:00
import.go
Remove reference package dependency from the api.
2016-04-07 15:01:23 -07:00
info.go
Show "seccomp" in docker info (#20909).
2016-03-30 09:23:15 +00:00
inspect_unix.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
inspect_windows.go
Windows libcontainerd implementation
2016-03-18 13:38:41 -07:00
inspect.go
Docker inspect gave default log options even when the option is emtpy.
2016-05-02 21:14:42 -07:00
kill.go
Fix critical bug: can't restart a restarting container
2016-04-08 22:02:30 +08:00
links_test.go
Extract container store from the daemon.
2016-01-19 13:21:41 -05:00
links.go
Add migration from sqlite links back to hostConfig
2016-01-11 11:31:29 -05:00
list_unix.go
Move Container to its own package.
2015-12-03 17:39:49 +01:00
list_windows.go
Move Container to its own package.
2015-12-03 17:39:49 +01:00
list.go
Deprecated of docker ps since and before options for v1.12
2016-04-19 18:13:55 +08:00
logdrivers_linux.go
daemon/logger: Add logging driver for Google Cloud Logging
2016-03-01 08:06:10 -08:00
logdrivers_windows.go
Windows: Add ETW logging driver plug-in
2016-02-16 13:24:49 -08:00
logs.go
inherit the daemon log options when creating containers
2016-05-02 23:04:04 +08:00
monitor_linux.go
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 14:03:05 -07:00
monitor_windows.go
Adding servicing update to postRunProcessing for Windows containers.
2016-04-25 12:16:26 -07:00
monitor.go
Merge pull request #21839 from WeiZhang555/add-start-event
2016-04-08 17:52:22 -07:00
mounts.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
network.go
Fix authorization issue - when request is denied return forbbiden exist code (403).
2016-05-02 19:14:48 +03:00
oci_linux.go
Simplify blkio resources setup in spec
2016-04-29 13:39:04 -07:00
oci_windows.go
Add IO Resource Controls for Windows
2016-04-25 13:07:29 -07:00
pause.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
rename.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
resize.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
restart.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05:00
seccomp_disabled.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
seccomp_linux.go
Reuse profiles/seccomp package
2016-03-19 14:15:39 -07:00
selinux_linux.go
Rename daemon/utils_*.go to selinux
2015-11-12 15:48:41 -08:00
selinux_unsupported.go
Rename daemon/utils_*.go to selinux
2015-11-12 15:48:41 -08:00
start.go
inherit the daemon log options when creating containers
2016-05-02 23:04:04 +08:00
stats_collector_unix.go
Create a copy of stats value before modifications
2016-04-18 11:41:38 -07:00
stats_collector_windows.go
Move Container to its own package.
2015-12-03 17:39:49 +01:00
stats.go
Update code for latest engine-api
2016-04-19 16:56:54 +02:00
stop.go
Remove static errors from errors package.
2016-02-26 15:49:09 -05: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
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
update_windows.go
Windows libcontainerd implementation
2016-03-18 13:38:41 -07:00
update.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
volumes_unit_test.go
reorder imports with goimports
2015-12-16 16:50:25 +01:00
volumes_unix.go
Replace execdrivers with containerd implementation
2016-03-18 13:38:32 -07:00
volumes_windows.go
Remove unneeded references to execDriver
2016-03-21 13:06:08 -07:00
volumes.go
Fix N+1 calling Path() on volume ls
2016-04-12 20:30:34 -04:00
wait.go
Rename Daemon.Get to Daemon.GetContainer.
2015-12-11 12:39:28 -05:00