73973301dc
Default process user to container config user.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0faa4518ed2dad592bb238838b4df2b34d2171c3
Component: engine
2015-06-29 12:52:05 -07:00
6d91855b5c
Merge pull request #13740 from Microsoft/10662-securitywarning
...
Windows: Security warning based on server OS
Upstream-commit: 389b806945c5b2e621e3390b565f4f786e952d99
Component: engine
2015-06-26 13:09:03 -07:00
786eafcf79
Merge pull request #14120 from mdavranche/tempDir
...
tempDir (in the root dir), must be created after the root dir.
Upstream-commit: 2d15b35f7afaf496ecfbfd61e2c102033255386e
Component: engine
2015-06-26 11:46:55 -07:00
1e47c22f14
Windows: Security warning based on server OS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 126529c6d0a20675de8f50939c57f23259d3e763
Component: engine
2015-06-26 10:33:45 -07:00
229f4e374b
Merge pull request #14126 from laijs/fix-file-permission
...
docs: fix file's permissions
Upstream-commit: 31ae9d876ad577775e8492065a02a364d745ccde
Component: engine
2015-06-26 10:08:06 -07:00
117120a297
Merge pull request #14162 from dnozay/patch-1
...
more friendly message for when docker daemon is not running.
Upstream-commit: f46ac8c51c1c481a43f4e503a397f65bc2ae1425
Component: engine
2015-06-26 09:27:21 -07:00
009aa5c322
Merge pull request #12876 from tagomoris/logger-driver-fluentd
...
Add new Logging driver "fluentd"
Upstream-commit: b96f1093441a20678c9ff0e57528bbb780b34d10
Component: engine
2015-06-26 08:41:10 -07:00
4fb55aac44
Adding installation index
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: d5de3ed09ec0fc218cb26bb5556b77043887902d
Component: engine
2015-06-26 02:12:27 -07:00
ea81a648e3
Merge pull request #14046 from mattmoor/token-investigation
...
Unconditionally use AuthTransport.
Upstream-commit: c7ece73fa435873b83fa72279749cd004af8e4bd
Component: engine
2015-06-25 19:07:10 -07:00
6aea64cdef
Update English expressions by review comments
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
Upstream-commit: 78f4a9dad4fb92fb2175ff5afe5fb2d7938e9668
Component: engine
2015-06-26 11:04:26 +09:00
22652d4dad
Add new logging driver: fluentd
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
Upstream-commit: 361a582ba0bccea04a8ea1799e68779fa66abb9f
Component: engine
2015-06-26 11:03:11 +09:00
3c4d6e026e
Merge pull request #14139 from jlhawn/fix_build_with_auth
...
[api, builder] Fix build auth config
Upstream-commit: dd408891baff5cd820f917a001364add35f5f878
Component: engine
2015-06-25 17:39:36 -07:00
a3f7d22b3d
Fix docs for #14047
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 857e0ba32e38f02b96e7c6753d902aca7a7922fc
Component: engine
2015-06-25 13:39:12 -07:00
e3b5666310
Merge pull request #14142 from fl0yd/patch-1
...
Update plugins_volume.md
Upstream-commit: 50a1d0f0ef83a9ed55ea2caaa79539ec835877a3
Component: engine
2015-06-25 13:17:02 -07:00
4cecda2c58
Merge pull request #14183 from ChanderG/master
...
Fix minor typo in CONTRIBUTING.md
Upstream-commit: be33d13f679bbb45903109aab7026b1cc0769971
Component: engine
2015-06-25 13:16:04 -07:00
3fae971f18
Merge pull request #14178 from csarrazi/patch-1
...
[Easy-Pick] [Documentation] Fix broken links for Fedora
Upstream-commit: de9c5473f769c6b18c1417525de3873304de2f80
Component: engine
2015-06-25 13:15:26 -07:00
92f8fb20db
Merge pull request #14161 from laijs/man_pages
...
man: convert `docker/docs/man` to `docker/man`
Upstream-commit: 15d8e7bc6b8f1bbe56c5f7e1fa15d60942a33a9a
Component: engine
2015-06-25 13:12:46 -07:00
7241037f74
Merge pull request #14156 from HuKeping/master
...
Docs: fix wrong example of API Exec
Upstream-commit: 8c8e8d624f546e52d37ce09f5e16361bc38df073
Component: engine
2015-06-25 13:09:36 -07:00
c4d8b40978
Splitting out the cli command into parts.
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 561bfb268de3c674b04d48895b7e46ae890ef795
Component: engine
2015-06-25 12:02:41 -07:00
f74cf65168
Merge pull request #14030 from estesp/init-memory-swappiness
...
Initialize swappiness in libcontainer cgroups template
Upstream-commit: c2815496101e7523c8bc2e459026f8c5e84cdb08
Component: engine
2015-06-25 11:36:54 -07:00
a6a8015e93
Merge pull request #13907 from chenchun/exitcode
...
Set exit code of old running container as 137
Upstream-commit: e8b87cfce10551ec132b470036c26374f1971fe1
Component: engine
2015-06-25 10:57:48 -07:00
55a285c243
Merge pull request #14182 from moxiegirl/fix-logging
...
Breaking logging driver material out of run
Upstream-commit: 81d6f6093597a0f37aba5f2c127a8476c8183053
Component: engine
2015-06-25 10:28:36 -07:00
ed7a281af0
Merge pull request #14163 from mrjana/cnm_integ
...
Fix endpoint leave failure for --net=host mode
Upstream-commit: e0cfe36b8e0ffbbfd611166bc509cfe2c5e6ee8f
Component: engine
2015-06-25 10:17:03 -07:00
d924a293ae
Update utils.go
...
make error message when running commands while daemon is down more user-friendly.
```
docker@54.175.201.239 ~: sudo service docker stop
docker stop/waiting
docker@54.175.201.239 ~: docker images
Get http:///var/run/docker.sock/v1.19/images/json : dial unix /var/run/docker.sock: no such file or directory. Are you trying to connect to a TLS-enabled daemon without TLS?
```
Signed-off-by: Damien Nozay <damien.nozay@gmail.com >
Upstream-commit: e9ac7d24a7de5e009f74887cf21f15b6bb4e4605
Component: engine
2015-06-25 10:15:52 -07:00
92372b77d4
Set exit code of old running container as 137
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
Upstream-commit: b0b2f979c7c43e2975d5e39340c168da2da42d1d
Component: engine
2015-06-25 22:30:09 +08:00
a3ea369a1a
Fix minor typo in CONTRIBUTING.md
...
Signed-off-by: ChanderG <chandergovind@gmail.com >
Upstream-commit: e594a2fb5426c2a28d98ee89717be7603358528c
Component: engine
2015-06-25 18:23:38 +05:30
dbd2bb096f
Breaking logging driver material out of run
...
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 31dd97f4adb215b23504f72e7a17464bc6428419
Component: engine
2015-06-25 05:00:49 -07:00
fe27ada373
Fix broken fedora documentation
...
The documentation is currently broken for the fedora page. This PR fixes missing the markup.
Signed-off-by: Charles Sarrazin <charles@sarraz.in >
Upstream-commit: 62213219dc97a97471f8d7813aa61a74745ec902
Component: engine
2015-06-25 10:16:46 +02:00
0a0ed52f4f
Merge pull request #13973 from calavera/fix_zfs_options_doc_location
...
Move zfs options doc to the storage section.
Upstream-commit: 4ab8b8828666c8d0651e96d61b5c616d26c5e229
Component: engine
2015-06-24 15:52:13 -07:00
5ec67f98b1
Fix endpoint leave failure for --net=host mode
...
When a container is started with `--net=host` with
a particular name and it is subsequently destroyed,
then all subsequent creations of the container with
the same name will fail. This is because in `--net=host`
the namespace is shared i.e the host namespace so
trying to destroy the host namespace by calling
`LeaveAll` will fail and the endpoint is left with
the dangling state. So the fix is, for this mode, do
not attempt to destroy the namespace but just cleanup
the endpoint state and return.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 9bb69f9726e7f8cba0cdf681e5060e47b9c45298
Component: engine
2015-06-24 12:33:52 -07:00
ce8189c680
Docs: fix wrong example of API Exec
...
The last "," should not shown up, otherwise you will get the error
back as below:
- invalid character '}' looking for beginning of object key string.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 221fa4c3d11973f6b973daf26fd962554945fc68
Component: engine
2015-06-25 02:03:27 +08:00
798580eff0
Merge pull request #14119 from moxiegirl/fix-heading-blanks
...
Fix heading blanks
Upstream-commit: afd4d544cfabce9d2d8890e2c4a4e6f2f0a00a46
Component: engine
2015-06-24 08:35:42 -07:00
1ac435232c
man: convert docker/docs/man to docker/man
...
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com >
Upstream-commit: 85e29574099b7b6fd555511e21973b15f8a4c24c
Component: engine
2015-06-24 23:31:12 +08:00
decc5d5340
Fix Typo in stdcopy.go
...
Signed-off-by: Yu Chengxia <yuchengxia@huawei.com >
Upstream-commit: 16be453e0f3827278427f33bbec110e0fabbc17f
Component: engine
2015-06-24 15:00:14 +08:00
673c619987
Update plugins_volume.md
...
Signed-off-by: Mark Oates <fl0yd@me.com >
Upstream-commit: 0835b20aceb6f5eff833abcbb4a720ad113a7d72
Component: engine
2015-06-23 15:30:36 -07:00
aa8bc7e1e7
[api, builder] Fix build auth config
...
With the 1.7 release, we introduced a change to how we store registry
credentials, but the build API endpoint did not expect a change in the format
of that file. This patch fixes this problem so that you can again pull private
images during `docker build`.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 02c7bbefb8841e5e86a4b9d467defa668e3ea613
Component: engine
2015-06-23 12:58:17 -07:00
892d0c95d1
Merge pull request #13810 from d23/syslog-facility
...
Add syslog-facility option
Upstream-commit: 4dd1d1bfa5ddb7295d001c5df35865da34ac048b
Component: engine
2015-06-23 12:05:15 -07:00
9a58f60656
Merge pull request #13833 from Microsoft/10662-dockerbuild
...
Windows: Start docker build working
Upstream-commit: d5721f03854f33300f84186554321c3371a28319
Component: engine
2015-06-23 11:46:56 -07:00
587b3d159c
Merge pull request #13966 from mountkin/fix-stats-goroutine-leak
...
fix the goroutine leak in the stats API if the container is not running
Upstream-commit: aa4f495caee6ba66ce33a8ef4db0d4067c17195b
Component: engine
2015-06-23 10:06:35 -07:00
e5b3b3d23c
Merge pull request #14047 from Microsoft/10662-versionadd
...
Add build time to version and tidy output
Upstream-commit: 5c93c265f69198509d405862127ad9b11be2e269
Component: engine
2015-06-23 09:57:31 -07:00
838eed9bed
docs: fix file's permissions
...
The README.md and the *.png should not have the executable
permissions, remove them.
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com >
Upstream-commit: f23698bb142b2dab8c2a437503adc0e102d8c7c0
Component: engine
2015-06-24 00:09:27 +08:00
f60afe1d2b
Merge pull request #14114 from HuKeping/master
...
Remove useless conversion
Upstream-commit: 9b5875eb9dfa55ca299a3bbc3817997e7167221f
Component: engine
2015-06-23 08:10:34 -07:00
1656b9dd4e
Remove useless conversion
...
It is already type float.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 250ce20feef6e052025b124dc4e1bc844a9cf9a9
Component: engine
2015-06-24 00:47:08 +08:00
c7e221d5e4
tempDir (in the root dir), must be created after the root dir.
...
Signed-off-by: mikael.davranche <mikael.davranche@corp.ovh.net >
Upstream-commit: 41f69883d25cc62ae2fb1efdf79f2e7df539c56a
Component: engine
2015-06-23 14:53:18 +02:00
1547f31ef8
Fixes #14117
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 960cbd2c8dd7dfa794c11087babed46bea5d792e
Component: engine
2015-06-23 05:17:20 -07:00
f157cc3d55
Closes #14055 for anchal
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e81861ea5419068e7919db892c8c9db53ae5bbe6
Component: engine
2015-06-23 05:14:53 -07:00
f157b240b8
Add --log-opt to specify facility for syslog driver
...
Signed-off-by: Dennis Docter <dennis@d23.nl >
Upstream-commit: 609e7b0a55d4082fce40eabae3a06ca57c188ba5
Component: engine
2015-06-23 14:04:25 +02:00
eb72177bf2
fix the goroutine leak in the stats API if the container is not running
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 1cbf5a54dae86e34d8e65508c5640b17cda0eed8
Component: engine
2015-06-23 19:38:15 +08:00
d1849214e2
Merge pull request #14110 from webwurst/patch-2
...
Typo
Upstream-commit: cb6ca19b5311d1d42a7c00ff6e5ba2728f4e013e
Component: engine
2015-06-23 12:34:16 +02:00
144b1ee01b
Merge pull request #14111 from bfirsh/update-compose-swarm-docs
...
Fix compose/swarm/network docs
Upstream-commit: 51264fa63c03833dec93d05b1f8ca3984e794eab
Component: engine
2015-06-22 17:23:57 -07:00
