009fa2d15e
Merge pull request #14269 from vdemeester/pkg-parsers-test-coverage
...
Add and refactor tests for pkg/parsers{,*}
Upstream-commit: 20467faf132b113a4771fe665e2ce7335de94063
Component: engine
2015-06-29 15:24:14 -07:00
f1c962082a
Merge pull request #14133 from Microsoft/10662-netmode
...
Windows: Refactor network modes
Upstream-commit: 18d5d3ba0332f95a294f09cd8c3ac9aeada0a4a5
Component: engine
2015-06-29 15:02:42 -07:00
fec4b99167
Merge pull request #14218 from calavera/fix_exec_user
...
Default process user to container config user.
Upstream-commit: 475ae0889e2d460084e6ba9bb047b8acbc87c535
Component: engine
2015-06-29 14:31:45 -07:00
bfd9d20e79
Add test coverage to pkg/parsers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b81472a6d861b335d968a1e970d9aebc314530f2
Component: engine
2015-06-29 22:30:11 +02:00
0a2b0f80c4
Windows: Refactor network modes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c5e6a4b307d93c066c07b7664ffc676708b42391
Component: engine
2015-06-29 13:13:55 -07:00
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
e9b5745a3f
Merge pull request #14222 from erikdw/fix-casing-of-vmware-in-main-doc
...
Use proper casing for VMware in README
Upstream-commit: 77396bd66acc141f1d5a1743cecd27777af7ef1d
Component: engine
2015-06-29 15:16:01 -04:00
75dc0ff78d
Merge pull request #14244 from ankushagarwal/patch-1
...
Update README.md
Upstream-commit: 4fd284bde00f863d4d8b4196e38eb3fb5299805b
Component: engine
2015-06-29 11:53:25 -07:00
0bc889c212
Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
...
fix(docs): removed extra quote character in heading
Upstream-commit: 0aea0e4072c403d7377ff63313196fb8fdabf9a1
Component: engine
2015-06-29 11:05:54 -07:00
a8c9aef74e
Merge pull request #14061 from runcom/clean-builder-daemon-config
...
Add struct to configure Builder commit
Upstream-commit: d543a01e17ace181261dd7809bbeec0c6580b867
Component: engine
2015-06-29 11:04:05 -07:00
d3d22ab0cd
Merge pull request #14193 from stevvooe/concurrent-pull-fix
...
Attempt to protect on disk image store with mutex
Upstream-commit: cb2079e21853d04164aba13291c62ad8eeba1e15
Component: engine
2015-06-29 10:28:02 -07:00
67af392a8e
Merge pull request #14243 from moxiegirl/carry-pr-13323
...
Closes #13323 and carries
Upstream-commit: 985fd1c6cc65a29c25d061f350bb938b3c750117
Component: engine
2015-06-29 08:33:34 -07:00
184681a206
fix(docs): removed extra quote character in heading
...
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com >
Upstream-commit: d612782023f550d6990e9fc76c2a9de97ab97a43
Component: engine
2015-06-29 09:46:50 -05:00
3b04e3bce0
Merge pull request #14147 from ericsage/patch-1
...
Fix Typo in experimental docs
Upstream-commit: a386a00a3cf93dd77c5e95e16233cf5231ceba65
Component: engine
2015-06-29 10:41:09 -04:00
e0f8fd3174
Merge pull request #13876 from vdemeester/pkg-jsonlog-test-coverage
...
Add test coverage to pkg/jsonlog
Upstream-commit: e1afbbf247242b84f32e5bbd29f178a8385715a9
Component: engine
2015-06-29 16:39:56 +02:00
4f74d3f3bd
Closes #13323 and carries
...
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 078b23a37daf95101bf31bafc7f8396af7ad7d98
Component: engine
2015-06-29 06:18:41 -07:00
1cf7df57b2
Update README.md
...
cgroups and namespaces links are broken. They point to blog.dotcloud.com which is dead. Updating the links to point to informative pages.
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9bbdaa9280609c2c6fc86c6749dfb3d4869d0097
Component: engine
2015-06-29 01:10:27 -07:00
c791ee6a21
Merge pull request #14198 from cpuguy83/14170_fix_entrypoint_as_string
...
Fix unmarshalling of Command and Entrypoint
Upstream-commit: 40a41ffdf0b3901866866c5b7ef9d4e4c71bb552
Component: engine
2015-06-28 19:47:26 -06:00
9e13a75360
Add test coverage to pkg/jsonlog
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e7a9a0bed84dc04db8d68dfc48fe095c5ce3edcb
Component: engine
2015-06-27 10:13:47 +02:00
5597af50f8
Use proper casing for VMware in README
...
Signed-off-by: Erik Weathers <erikdw@gmail.com >
Upstream-commit: 9030f531659ddc9ca7bfffcb708cde579973e2ae
Component: engine
2015-06-26 19:16:29 -07:00
d139e0f463
Merge pull request #13779 from estesp/tls-confusing-error
...
Add better client-side error for failed certificate verification
Upstream-commit: 7571e6d90083f619f5068a1dddc6d9835201f908
Component: engine
2015-06-27 02:08:04 +02:00
2107a3b6a8
Add better client error for client certificate failure (missing or denied)
...
This adds a more meaningful error on the client side so the "bad
certificate" error coming from the TLS dial code has some context for
the user.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: d175ef6773708afef5982d233ad600f18cf2cdc2
Component: engine
2015-06-26 16:23: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
213128a629
Fix unmarshalling of Command and Entrypoint
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 17d6f00ec2b8b9636f0bb64c55a5b3855e8f4bae
Component: engine
2015-06-26 09:00:57 -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
aa86cde326
Merge pull request #14200 from moxiegirl/create-install-index
...
Adding installation index
Upstream-commit: b49c9850a606abdd57488d4888279fde93ee3a57
Component: engine
2015-06-26 02:14:44 -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
205cf6d70e
Attempt to protect on disk image store with mutex
...
During `(*Graph).Register, there was no protection on adding new layers
concurrently. In some cases, this resulted in corruption of a layer by creating
the directory but not the underlying data. This manifested in several different
IO errors reported in the client. This attempts to fix this by adding a mutex
by Image ID to protect the Register operation.
We do not completely understand the root cause of this corruption other than
the result is somehow tied to this particular function. This fix has been
confirmed to address the issue through testing.
Unfortunately, this fix does not address existing corruption. The user will
have to remove and re-pull the corrupt layer to stop the error from happening
in the future. This change only ensures that the layer will not become corrupt.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 7eac23cf8de08f281c84c36390f734dbaef8c69a
Component: engine
2015-06-25 20:16:37 -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
fc922c66b4
Merge pull request #14187 from Microsoft/docs-version
...
Fix docs for #14047
Upstream-commit: 2e078b24b839c7801ed3b8065c5df03d1f768474
Component: engine
2015-06-25 16:07:27 -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
fe187a1beb
Merge pull request #14189 from moxiegirl/carry-14079
...
Splitting out the cli command into parts.
Upstream-commit: 7201127cfb2517f0c0be8f72355407e577882779
Component: engine
2015-06-25 12:05:56 -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
