800fcaba4c
Merge branch 'master' into add_some_tests
...
Upstream-commit: be77ee33bca2399b4eb6749253b9c3ab18915783
Component: engine
2013-08-08 14:44:56 +00:00
440cdd2c06
Merge pull request #1456 from dotcloud/1455-force_commit_build_env
...
Make sure ENV instruction within build perform a commit each time
Upstream-commit: 5928ed5d45a393fbd627b3c06eca56eeabca7504
Component: engine
2013-08-08 07:37:51 -07:00
c2560e21bf
Make sure ENV instruction within build perform a commit each time
...
Upstream-commit: 6a6a2ad8a4af85b543a24c5d22a2be5fdfc252d6
Component: engine
2013-08-07 17:23:49 -07:00
2f4a7982a7
Merge pull request #1420 from jpetazzo/fix-get-docker-io-upstart-script
...
* Packaging: Fix the upstart script generated by get.docker.io
Upstream-commit: 279fe144e180725b8468d8210a84a294290d1439
Component: engine
2013-08-07 17:13:54 -07:00
500bb791ba
Merge pull request #1423 from krautcomputing/fix_indentation_in_vagrantfile
...
Fix indentation in Vagrantfile
Upstream-commit: cc80bd41c43da818e464a35e572fa456fd4a8796
Component: engine
2013-08-07 17:10:40 -07:00
d9ad2761a9
Merge pull request #1447 from kermit666/image-tag-doc
...
doc: syntax to run a specific image tag
Upstream-commit: 06183e6cdc8c2b7cef456eaf1ac1d904b57a9650
Component: engine
2013-08-07 16:23:45 -07:00
490527a43f
Merge pull request #1425 from dotcloud/simplify_ProgressReader
...
- Runtime: fix small \n error un docker build
Upstream-commit: 6249cc3373ccc18ae154a8861bb98e772639c0ce
Component: engine
2013-08-07 16:19:42 -07:00
33828cfbb1
Merge pull request #1451 from dotcloud/michael-maintainer
...
Add Michael Crosby to core maintainers
Upstream-commit: 80f34c6aebc988884c3bb137794e1f488aabab0c
Component: engine
2013-08-07 15:53:29 -07:00
228a0e9732
Merge pull request #1435 from jpetazzo/userland-proxy-should-listen-on-inaddr-any
...
* Runtime: Let userland proxy handle container-bound traffic
Upstream-commit: a2f526dadc71e4f7b6aa8d8bbbd0594d24146a78
Component: engine
2013-08-07 15:48:17 -07:00
84dfd730ab
Merge pull request #1445 from dsissitka/host
...
* Runtime: Updated the Docker CLI to specify a value for the "Host" header.
Upstream-commit: 429d2f85cb23332a59d42c096bba0e227d2f5663
Component: engine
2013-08-07 15:38:50 -07:00
1aeb7ad567
Merge pull request #1395 from c00w/490-warn-ipv4forwarding-disabled
...
* Runtime: Add warning when net.ipv4.ip_forwarding = 0
Upstream-commit: 2ca018b2ebc2ba95e7b0812053f7bccbe73a6463
Component: engine
2013-08-07 15:31:12 -07:00
26c9729379
Merge pull request #1362 from dotcloud/registry_test
...
* Registry: Registry unit tests + mock registry
Upstream-commit: 3e6e08ce00eb7e90a5302683b71d6aaf826083ca
Component: engine
2013-08-07 15:30:07 -07:00
c75bcf8bab
Fix reversed IPv4Forwarding check in api.go
...
Upstream-commit: 3e491f8698860ed92b9f4cd6790eda82e083ae1e
Component: engine
2013-08-07 18:28:40 -04:00
8dc1c40e57
Add Colin Rice to AUTHORS file
...
Upstream-commit: ccffa6976616ddf5fc8c83f84d17e53ca8e0bca9
Component: engine
2013-08-07 18:28:39 -04:00
c746f1a64f
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
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
2013-08-07 18:28:39 -04:00
41cf866a86
Merge pull request #1093 from monnand/910-login-info
...
* Runtime: fixed #910 . print user name to docker info output
Upstream-commit: 65a4e308258f4cd85237adf4934c630e3b8f1039
Component: engine
2013-08-07 15:09:55 -07:00
eb420bcab3
Merge pull request #1450 from dotcloud/add-sandbox
...
- Builder: Forbid certain paths within docker build ADD
Upstream-commit: e63960caae56ded9d65f8d0a2ceedcead928baa1
Component: engine
2013-08-07 15:04:36 -07:00
a692d94c4f
Add Michael Crosby to core maintainers
...
Upstream-commit: 4860df1689f2f98d65aece0f4768b8ae98301d1e
Component: engine
2013-08-07 21:24:41 +00: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
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
5081a0aa8b
changed the twitter handle
...
Upstream-commit: 1d654f615673aecb32011bd5a28c2ac43dbbc1fb
Component: engine
2013-08-06 11:40:16 -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
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
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
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
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
