a60f1182de
Modify test to accept error from mkContainer
...
Upstream-commit: ced93bcabdc0dd0f6dcfa52174be552adf6c5bd1
Component: engine
2013-08-07 19:07:39 +00:00
89a694fd4b
Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
...
Upstream-commit: 0e21de9a25edfe56fa996055712d25b7a3345f0d
Component: engine
2013-08-07 09:38:49 -07:00
fa6b9b59de
Forbid certain paths within docker build ADD
...
Upstream-commit: 3104fc8d33ce4c26a446826639a7b2dba524264f
Component: engine
2013-08-07 16:05:30 +00:00
6949e430e2
Merge pull request #1434 from jpetazzo/fix-ec2-dns-conflict
...
change network range to avoid conflict with EC2 DNS
Upstream-commit: 2409df9285f56514de6d675ecd3df678d9b5e5cc
Component: engine
2013-08-07 08:43:53 -07:00
e2b4fe244d
Merge pull request #1436 from jpetazzo/fix-loopback-interface-test-index
...
relax the lo interface test to allow iface index != 1
Upstream-commit: 2e37be973f6d4ccd3ba30c9d5c3780e1e740a8c8
Component: engine
2013-08-07 08:40:55 -07:00
16fcec2f1e
doc: syntax to run a specific image tag
...
Upstream-commit: 6115348dd9e302e8323b857ae8ab1061159e69cd
Component: engine
2013-08-07 13:57:31 +02:00
b0ec69fb38
Updated my last commit to use tabs instead of spaces.
...
Upstream-commit: 416d0986886cd322ecae1114c13565bbc27b305c
Component: engine
2013-08-07 05:35:38 -04:00
3b3499d0fa
Updated the Docker CLI to specify a value for the "Host" header.
...
Upstream-commit: 6bbe66d2e6414a127f0f543c0138f1709bd3b8b4
Component: engine
2013-08-07 05:33:03 -04:00
7f637cb2dc
Merge pull request #1430 from metalivedev/1031-linuxheaders
...
Suggest installing linux-headers by default. Address #1187 and #1031
Upstream-commit: 3782e34e670c627a11a60ab96f3585d485ac8f6f
Component: engine
2013-08-06 18:56:34 -07:00
faa72ea812
relax the lo interface test to allow iface index != 1
...
Upstream-commit: 84790aafd8b3050e502a16f03ee288c1bb9c21b6
Component: engine
2013-08-06 18:31:05 -07:00
437d59d219
Let userland proxy handle container-bound traffic
...
Upstream-commit: fea2d5f2fe81d983efbdd803cef2fd1c70f98ebc
Component: engine
2013-08-06 17:44:39 -07:00
217ae3229e
change network range to avoid conflict with EC2 DNS
...
Upstream-commit: 9f1c9686e0ee47289adeeedd6cf8d5296a058463
Component: engine
2013-08-06 17:24:10 -07:00
2b2233fe77
Suggest installing linux-headers by default. Address #1187 and #1031
...
Upstream-commit: e0a6f27d1bbf053baf8a94c87fddd3f9ed30964c
Component: engine
2013-08-06 13:56:29 -07:00
e6c6ac1cfb
Merge pull request #1428 from dhrp/twitterhandle
...
changed the twitter handle
Upstream-commit: 9130ee7513bda99a2e51fb3fbb512cd73cde810f
Component: engine
2013-08-06 13:38:22 -07:00
cc9d593d21
brew: added support for push on private registries.
...
Upstream-commit: 65c8e9242cc73fd2f1ea949703cf7da34e8e9650
Component: engine
2013-08-06 21:08:27 +02:00
5081a0aa8b
changed the twitter handle
...
Upstream-commit: 1d654f615673aecb32011bd5a28c2ac43dbbc1fb
Component: engine
2013-08-06 11:40:16 -07:00
8bc1001370
Merge pull request #1221 from crosbymichael/cmd-cp
...
*Client: Add docker cp command and copy api endpoint to copy container files/folders to the host
Upstream-commit: 4af24e11a4bcc9e907bd096b016717e87763f3dd
Component: engine
2013-08-06 09:15:39 -07:00
2de21e781e
Move copy command docs to api 1.4 document
...
Upstream-commit: 583f5868c989b9da574638ffdc532826e5070347
Component: engine
2013-08-06 16:09:54 +00:00
073f998d1d
Strip leading forward slash from resource
...
Upstream-commit: d94b1860806e11038086e91c693d86a009dcd3b0
Component: engine
2013-08-06 16:09:54 +00:00
3ea6442a29
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
Upstream-commit: 5b8cfbe15c29efd3e72ea97ba87867590aeeba25
Component: engine
2013-08-06 16:09:54 +00:00
d158122ad5
Merge pull request #1394 from crosbymichael/1391-json-requests
...
Use mime pkg to parse Content-Type
Upstream-commit: 0dbc51f4d237e7d029c2e37d76fae198b6e37af5
Component: engine
2013-08-06 08:59:10 -07:00
6ad1290069
Use mime types to parse Content-Type
...
Upstream-commit: 754ed9043d6e1fed98160c7fb443bed0a9464acf
Component: engine
2013-08-06 15:57:13 +00:00
82d1681ff0
fix small \n error un docker build
...
Upstream-commit: ba17f4a06a75a66e11b6cf2ca2cdb5bee4f7bfa8
Component: engine
2013-08-06 14:31:51 +00:00
f5e3a27080
Fix indentation in Vagrantfile
...
Upstream-commit: b9149f45bf6bdef3b7025fe7c94a930696a4b4ab
Component: engine
2013-08-06 15:21:26 +02:00
8b07d34a9b
Merge pull request #1406 from dotcloud/1363-reduce_timeout-fix
...
Reduce connect and read timeout when pinging the registry (fixes issue #1363 )
Upstream-commit: b6c4b325a446f9eb5829af3d6a7d0222cf0f22b6
Component: engine
2013-08-06 04:22:44 -07:00
4260a5cc23
fixing #910
...
Upstream-commit: 965de6ef50ceb479168c9e4f7156fe2b855e4245
Component: engine
2013-08-05 23:37:53 -04:00
2eadef5023
Added index address into APIInfo.
...
Upstream-commit: 303490168fb53af2528375ca9ec818c7a179a044
Component: engine
2013-08-05 23:36:55 -04:00
8af91f66c1
Merge pull request #1421 from dotcloud/fix_makefile
...
Make sure all sources have the wanted revision
Upstream-commit: c7c2399be9404f5c1c7d50ac45d3425f9e7aecbe
Component: engine
2013-08-05 20:25:32 -07:00
dc3db8316e
Make sure all sources have the wanted revision
...
Upstream-commit: 120a520a225725475348b718a81562c6d6c1da86
Component: engine
2013-08-05 19:58:48 -07:00
09df97c0f0
Merge branch 'docs-example-fix' of git://github.com/faizkhan00/docker
...
merges #1402
Upstream-commit: 7c03bd1e7a8c62fcbcfeaf7d11809098fb347164
Component: engine
2013-08-05 18:21:19 -07:00
cb2611957a
fix the upstart script generated by get.docker.io (it was not starting dockerd on boot)
...
Upstream-commit: 049d28868e87df084748a91db5d1cfecb0de6d00
Component: engine
2013-08-05 18:11:13 -07:00
810e95ee21
Change daemon to listen on unix socket by default
...
Upstream-commit: 8934f13615e95a0c9f4bc52eefb5c97360e114f3
Component: engine
2013-08-06 00:12:56 +00:00
74373c4d59
Update utils_test.go
...
Upstream-commit: dcf9dfb12961fc8101624af0b925d026fde4cde1
Component: engine
2013-08-05 16:32:25 -07:00
ce6d62db16
Merge pull request #1387 from joevandyk/patch-1
...
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
Upstream-commit: 7c9604e32beea824238c0f2ac055577feb307786
Component: engine
2013-08-05 16:14:57 -07:00
19323fe51f
Merge pull request #1418 from dhrp/remote_api_doc_improvements
...
Fixed some typo's and formatting issues in remote api documentation.
Upstream-commit: b302ae329c42db56cbe5a02537c8c5a6240faad2
Component: engine
2013-08-05 16:13:55 -07:00
46b7e044d5
Fixed some typo's and formatting issues in remote api documentation.
...
Upstream-commit: ff6b6f2ce1f51c38b00d1a70376182645b4a0c85
Component: engine
2013-08-05 15:55:40 -07:00
c001846be2
Merge pull request #1303 from dhrp/update-spinx-for-man
...
Enabled the docs to generate manpages.
Upstream-commit: d49f141fb3dc79bc4a22bbf398410f8d712bcf36
Component: engine
2013-08-05 15:31:51 -07:00
5e3a4de02f
Update version.
...
Upstream-commit: 590fc58de70bb281812371be6e44ccb7d73d3ec6
Component: engine
2013-08-05 14:49:37 -07:00
4b74bc802f
Update CHANGELOG.md
...
Upstream-commit: c03561eea84f88d0eeddd84a7021876852c0a7c0
Component: engine
2013-08-05 14:32:54 -07:00
3eb7f19fae
fixed #910 . print user name to docker info output
...
Upstream-commit: 4179f25286dde9f9e83bffa07c303373844b5ed2
Component: engine
2013-08-05 17:25:29 -04:00
00a7cbd80b
Merge pull request #1290 from dotcloud/parallel_pull
...
* Runtime: Parallel pull
Upstream-commit: e54e8fa9205409e741a64c7d7746e2e548c52fc0
Component: engine
2013-08-05 14:17:29 -07:00
4f40fd43df
Merge pull request #1374 from dotcloud/steeve-patch-1
...
- Runtime: Handle ip route showing mask-less IP addresses
Upstream-commit: 2f1c05d99731572d93edbaf55b5fdf856fde290a
Component: engine
2013-08-05 14:13:20 -07:00
2bc60625b2
Merge pull request #1390 from grobie/clarify-amazon-documentation
...
Clarify Amazon EC2 installation type
Upstream-commit: baa4618e57eadcb320dcd0b93ab2bd0dedee7d5a
Component: engine
2013-08-05 13:26:28 -07:00
33a79b5058
Merge pull request #1404 from dnordberg/fix-base-refs
...
'Base' image is depreciated and should no longer be referenced in the docs.
Upstream-commit: dcc1e3562f26f86eb532c5a6724c2ae59999e28e
Component: engine
2013-08-05 13:24:05 -07:00
0c11df3e01
Merge pull request #1267 from sridatta/new-clean-init
...
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
2013-08-05 13:23:22 -07:00
61aee02980
Merge pull request #1411 from andrewmacgregor/doc-typos
...
Minor typos found while reading docs
Upstream-commit: d4fa619ed1b1b06f7d8dc52c9a0d87a33f6447a3
Component: engine
2013-08-05 13:22:53 -07:00
c70bce9196
Merge pull request #1364 from dotcloud/bump_0.5.1
...
Bump to v0.5.1
Upstream-commit: 8a851af5e60ef5807aa5e6a984461b0e3cc6bd0e
Component: engine
2013-08-05 12:10:03 -07:00
54865cc8e5
Adapted tests to latest registry changes
...
Upstream-commit: 8aa9985ad07f71fa9bd3b31dde81c0da6d0dc655
Component: engine
2013-08-05 20:28:05 +02:00
67eddf7cb1
Cleanup
...
Upstream-commit: 2c85b964e3be0f7ca3ff513b855f7bd26b936cc9
Component: engine
2013-08-05 19:07:23 +02:00
4c19fdff39
Mock access logs don't show up in non-debug mode
...
Upstream-commit: 9159c819c3baf33844f0cc38a4baa0c6674e8b9a
Component: engine
2013-08-05 19:06:00 +02:00
