docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12387 from x1022as/inspect-logpath 

Inspect show right LogPath in json-file driver
This commit is contained in:
Brian Goff 2015-04-15 14:28:39 -04:00
parent 2499baefdd acf025ad1b
commit f0c60f7085
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/container.go
View File

@ -1406,6 +1406,7 @@ func (container *Container) startLogging() error {
if err != nil { if err != nil {
return err return err
} }
container.LogPath = pth
dl, err := jsonfilelog.New(pth) dl, err := jsonfilelog.New(pth)
if err != nil { if err != nil {

5
docs/sources/reference/api/docker_remote_api_v1.18.md
View File

@ -359,7 +359,10 @@ Return low-level information on the container `id`
"MaximumRetryCount": 2, "MaximumRetryCount": 2,
"Name": "on-failure" "Name": "on-failure"
}, },
"LogConfig": { "Type": "json-file", Config: {} }, "LogConfig": {
"Config": null,
"Type": "json-file"
},
"SecurityOpt": null, "SecurityOpt": null,
"VolumesFrom": null, "VolumesFrom": null,
"Ulimits": [{}] "Ulimits": [{}]

5
docs/sources/reference/api/docker_remote_api_v1.19.md
View File

@ -362,7 +362,10 @@ Return low-level information on the container `id`
"MaximumRetryCount": 2, "MaximumRetryCount": 2,
"Name": "on-failure" "Name": "on-failure"
}, },
"LogConfig": { "Type": "json-file", "Config": {} }, "LogConfig": {
"Config": null,
"Type": "json-file"
},
"SecurityOpt": null, "SecurityOpt": null,
"VolumesFrom": null, "VolumesFrom": null,
"Ulimits": [{}] "Ulimits": [{}]