Commit Graph

3720 Commits

Author SHA1 Message Date
Guillaume J. Charmes 279fe144e1 Merge pull request #1420 from jpetazzo/fix-get-docker-io-upstart-script
* Packaging: Fix the upstart script generated by get.docker.io
2013-08-07 17:13:54 -07:00
Daniel Mizyrycki cc80bd41c4 Merge pull request #1423 from krautcomputing/fix_indentation_in_vagrantfile
Fix indentation in Vagrantfile
2013-08-07 17:10:40 -07:00
Andy Rothfusz 06183e6cdc Merge pull request #1447 from kermit666/image-tag-doc
doc: syntax to run a specific image tag
2013-08-07 16:23:45 -07:00
Guillaume J. Charmes 6249cc3373 Merge pull request #1425 from dotcloud/simplify_ProgressReader
- Runtime: fix small \n error un docker build
2013-08-07 16:19:42 -07:00
Solomon Hykes 80f34c6aeb Merge pull request #1451 from dotcloud/michael-maintainer
Add Michael Crosby to core maintainers
2013-08-07 15:53:29 -07:00
Guillaume J. Charmes a2f526dadc Merge pull request #1435 from jpetazzo/userland-proxy-should-listen-on-inaddr-any
* Runtime: Let userland proxy handle container-bound traffic
2013-08-07 15:48:17 -07:00
Guillaume J. Charmes 429d2f85cb Merge pull request #1445 from dsissitka/host
* Runtime: Updated the Docker CLI to specify a value for the "Host" header.
2013-08-07 15:38:50 -07:00
Guillaume J. Charmes 2ca018b2eb Merge pull request #1395 from c00w/490-warn-ipv4forwarding-disabled
* Runtime: Add warning when net.ipv4.ip_forwarding = 0
2013-08-07 15:31:12 -07:00
Guillaume J. Charmes 3e6e08ce00 Merge pull request #1362 from dotcloud/registry_test
* Registry: Registry unit tests + mock registry
2013-08-07 15:30:07 -07:00
Colin Rice 3e491f8698 Fix reversed IPv4Forwarding check in api.go 2013-08-07 18:28:40 -04:00
Colin Rice ccffa69766 Add Colin Rice to AUTHORS file 2013-08-07 18:28:39 -04:00
Colin Rice 10190be5d7 Add warning when net.ipv4.ip_forwarding = 0
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
2013-08-07 18:28:39 -04:00
Guillaume J. Charmes 65a4e30825 Merge pull request #1093 from monnand/910-login-info
* Runtime: fixed #910. print user name to docker info output
2013-08-07 15:09:55 -07:00
Guillaume J. Charmes e63960caae Merge pull request #1450 from dotcloud/add-sandbox
- Builder: Forbid certain paths within docker build ADD
2013-08-07 15:04:36 -07:00
benoitc e2ca600fd8 Merge branch 'feature/attach_ws' into feature/attach_ws2
Conflicts:
	api.go
2013-08-07 23:30:28 +02:00
Solomon Hykes 4860df1689 Add Michael Crosby to core maintainers 2013-08-07 21:24:41 +00:00
Michael Crosby ced93bcabd Modify test to accept error from mkContainer 2013-08-07 19:07:39 +00:00
Sean P. Kane 0e21de9a25 Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools 2013-08-07 09:38:49 -07:00
Michael Crosby 3104fc8d33 Forbid certain paths within docker build ADD 2013-08-07 16:05:30 +00:00
Victor Vieux 2409df9285 Merge pull request #1434 from jpetazzo/fix-ec2-dns-conflict
change network range to avoid conflict with EC2 DNS
2013-08-07 08:43:53 -07:00
Victor Vieux 2e37be973f Merge pull request #1436 from jpetazzo/fix-loopback-interface-test-index
relax the lo interface test to allow iface index != 1
2013-08-07 08:40:55 -07:00
Dražen Lučanin 6115348dd9 doc: syntax to run a specific image tag 2013-08-07 13:57:31 +02:00
David Sissitka 416d098688 Updated my last commit to use tabs instead of spaces. 2013-08-07 05:35:38 -04:00
David Sissitka 6bbe66d2e6 Updated the Docker CLI to specify a value for the "Host" header. 2013-08-07 05:33:03 -04:00
Andy Rothfusz 3782e34e67 Merge pull request #1430 from metalivedev/1031-linuxheaders
Suggest installing linux-headers by default. Address #1187 and #1031
2013-08-06 18:56:34 -07:00
Jérôme Petazzoni 84790aafd8 relax the lo interface test to allow iface index != 1 2013-08-06 18:31:05 -07:00
Jérôme Petazzoni fea2d5f2fe Let userland proxy handle container-bound traffic 2013-08-06 17:44:39 -07:00
Jérôme Petazzoni 9f1c9686e0 change network range to avoid conflict with EC2 DNS 2013-08-06 17:24:10 -07:00
Andy Rothfusz e0a6f27d1b Suggest installing linux-headers by default. Address #1187 and #1031 2013-08-06 13:56:29 -07:00
Andy Rothfusz 9130ee7513 Merge pull request #1428 from dhrp/twitterhandle
changed the twitter handle
2013-08-06 13:38:22 -07:00
shin- 65c8e9242c brew: added support for push on private registries. 2013-08-06 21:08:27 +02:00
Thatcher Peskens 1d654f6156 changed the twitter handle 2013-08-06 11:40:16 -07:00
Victor Vieux 4af24e11a4 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
2013-08-06 09:15:39 -07:00
Michael Crosby 583f5868c9 Move copy command docs to api 1.4 document 2013-08-06 16:09:54 +00:00
Michael Crosby d94b186080 Strip leading forward slash from resource 2013-08-06 16:09:54 +00:00
Michael Crosby 5b8cfbe15c 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
2013-08-06 16:09:54 +00:00
Victor Vieux 0dbc51f4d2 Merge pull request #1394 from crosbymichael/1391-json-requests
Use mime pkg to parse Content-Type
2013-08-06 08:59:10 -07:00
Michael Crosby 754ed9043d Use mime types to parse Content-Type 2013-08-06 15:57:13 +00:00
Victor Vieux ba17f4a06a fix small \n error un docker build 2013-08-06 14:31:51 +00:00
Manuel Meurer b9149f45bf Fix indentation in Vagrantfile 2013-08-06 15:21:26 +02:00
Victor Vieux b6c4b325a4 Merge pull request #1406 from dotcloud/1363-reduce_timeout-fix
Reduce connect and read timeout when pinging the registry (fixes issue #1363)
2013-08-06 04:22:44 -07:00
Nan Monnand Deng 965de6ef50 fixing #910 2013-08-05 23:37:53 -04:00
Nan Monnand Deng 303490168f Added index address into APIInfo. 2013-08-05 23:36:55 -04:00
Michael Crosby c7c2399be9 Merge pull request #1421 from dotcloud/fix_makefile
Make sure all sources have the wanted revision
2013-08-05 20:25:32 -07:00
Guillaume J. Charmes 120a520a22
Make sure all sources have the wanted revision 2013-08-05 19:58:48 -07:00
Andy Rothfusz 7c03bd1e7a Merge branch 'docs-example-fix' of git://github.com/faizkhan00/docker
merges #1402
2013-08-05 18:21:19 -07:00
Jérôme Petazzoni 049d28868e fix the upstart script generated by get.docker.io (it was not starting dockerd on boot) 2013-08-05 18:11:13 -07:00
Michael Crosby 8934f13615 Change daemon to listen on unix socket by default 2013-08-06 00:12:56 +00:00
Guillaume J. Charmes dcf9dfb129 Update utils_test.go 2013-08-05 16:32:25 -07:00
Andy Rothfusz 7c9604e32b Merge pull request #1387 from joevandyk/patch-1
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
2013-08-05 16:14:57 -07:00