Commit Graph
2774 Commits
Author SHA1 Message Date
Jérôme Petazzoni 43b59cff4b add -insecure flag and relevant tests
Upstream-commit: 280901e5fbd0c2dabd14d7a9b69a073f6e8f87e4
Component: engine
2013-08-13 16:20:22 -07:00
Jérôme Petazzoni d8a5c45eaa Merge pull request #1463 from jpetazzo/https-get-docker-io
switch from http to https for get.docker.io
Upstream-commit: 04cd0a392bcadf36356047fd722ba1ce6cacce5f
Component: engine
2013-08-09 11:26:56 -07:00
Guillaume J. Charmes b46f1ca6a3 Merge pull request #1452 from dotcloud/improve_TestGetContainersTop
* Tests: Improve TestGetContainersTop so it does not rely on sleep
Upstream-commit: 55f9610cde8f4232a2f7bf84298cb1f5c27137ba
Component: engine
2013-08-09 10:28:34 -07:00
shin- 26131c8056 brew: added safeguards in script and changed default branch to 'master'
Upstream-commit: 6178dc7f1be0d3c90ed02e8ccbafa4d7e103508d
Component: engine
2013-08-09 16:40:28 +02:00
Solomon Hykes e19a396471 Merged 0.5.2 hotfix release back to master
Upstream-commit: b8f8f9d07e7142b56ddcb05d1b8c8322d1114436
Component: engine
2013-08-08 19:45:57 -07:00
Michael Crosby 99970249be Merge pull request #1464 from dotcloud/bump_0.5.2
Bump to 0.5.2
Upstream-commit: 1643943402fdbce021db51b0f4f49edb0fa2e285
Component: engine
2013-08-08 17:36:53 -07:00
Michael Crosby c3b5f3b391 Bump to v0.5.2
Upstream-commit: e99a99eb6ee7257c0b11312bec33fe27cffdaaaa
Component: engine
2013-08-09 00:17:35 +00:00
Michael Crosby d9f7dc6f82 Change daemon to listen on unix socket by default
Conflicts:
	docs/sources/api/docker_remote_api.rst
Upstream-commit: df9712f1c8039f83497e3c647788dd697f034158
Component: engine
2013-08-09 00:16:43 +00:00
Michael Crosby c297029200 Merge pull request #1417 from crosbymichael/root-socket
Change daemon to listen on unix socket by default
Upstream-commit: 28d38620f03d3db969f7e63655728b21180b26e9
Component: engine
2013-08-08 17:06:49 -07:00
Jérôme Petazzoni ddd4394f37 switch from http to https
Upstream-commit: 1ce9b3ca9c2ca2b2060e39a217d2e496c9a31826
Component: engine
2013-08-08 17:02:59 -07:00
Jérôme Petazzoni ee3c1a6db9 change network range to avoid conflict with EC2 DNS
Upstream-commit: 5c56b597a9f6d910ee1f22da42f8b9e5d18c678a
Component: engine
2013-08-08 23:27:55 +00:00
Michael Crosby f68b60ff71 Forbid certain paths within docker build ADD
Conflicts:
	buildfile_test.go
Upstream-commit: f712e10cb21d0056593ea23152d347637396c810
Component: engine
2013-08-08 23:22:14 +00:00
Sam Alba eadd4725b0 Merge pull request #1361 from dotcloud/library
Docker-brew and Docker standard library
Upstream-commit: 7f02bd3b7a814c6db77744ef668d4bbf9cc43946
Component: engine
2013-08-08 14:22:20 -07:00
Guillaume J. Charmes 1ea26ff1ae Improve TestGetContainersTop so it does not rely on sleep
Upstream-commit: ceb33818cdce434281889b75c278e43b85aec647
Component: engine
2013-08-08 11:51:31 -07:00
Michael Crosby ec7d64308d Merge pull request #1216 from dotcloud/add_some_tests
Add some tests in server and utils
Upstream-commit: c3027fa9ace7f607929af544dc1f59916f76f533
Component: engine
2013-08-08 09:57:18 -07:00
Victor Vieux 4f3f508ac7 rebase
Upstream-commit: 4249867e5bf01657b22be78141fa933ea6a036f0
Component: engine
2013-08-08 14:58:52 +00:00
Victor Vieux cf9140c17a rebase master
Upstream-commit: c804a5f827f31c5300f34ec4614a5067a0c17456
Component: engine
2013-08-08 14:56:37 +00:00
Victor Vieux 800fcaba4c Merge branch 'master' into add_some_tests
Upstream-commit: be77ee33bca2399b4eb6749253b9c3ab18915783
Component: engine
2013-08-08 14:44:56 +00:00
Victor Vieux 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Daniel Mizyrycki 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
Andy Rothfusz 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
Guillaume J. Charmes 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
Solomon Hykes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Colin Rice c75bcf8bab Fix reversed IPv4Forwarding check in api.go
Upstream-commit: 3e491f8698860ed92b9f4cd6790eda82e083ae1e
Component: engine
2013-08-07 18:28:40 -04:00
Colin Rice 8dc1c40e57 Add Colin Rice to AUTHORS file
Upstream-commit: ccffa6976616ddf5fc8c83f84d17e53ca8e0bca9
Component: engine
2013-08-07 18:28:39 -04:00
Colin Rice 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Solomon Hykes a692d94c4f Add Michael Crosby to core maintainers
Upstream-commit: 4860df1689f2f98d65aece0f4768b8ae98301d1e
Component: engine
2013-08-07 21:24:41 +00:00
Michael Crosby a60f1182de Modify test to accept error from mkContainer
Upstream-commit: ced93bcabdc0dd0f6dcfa52174be552adf6c5bd1
Component: engine
2013-08-07 19:07:39 +00:00
Michael Crosby fa6b9b59de Forbid certain paths within docker build ADD
Upstream-commit: 3104fc8d33ce4c26a446826639a7b2dba524264f
Component: engine
2013-08-07 16:05:30 +00:00
Victor Vieux 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
Victor Vieux 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
Dražen Lučanin 16fcec2f1e doc: syntax to run a specific image tag
Upstream-commit: 6115348dd9e302e8323b857ae8ab1061159e69cd
Component: engine
2013-08-07 13:57:31 +02:00
David Sissitka b0ec69fb38 Updated my last commit to use tabs instead of spaces.
Upstream-commit: 416d0986886cd322ecae1114c13565bbc27b305c
Component: engine
2013-08-07 05:35:38 -04:00
David Sissitka 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
Andy Rothfusz 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
Jérôme Petazzoni faa72ea812 relax the lo interface test to allow iface index != 1
Upstream-commit: 84790aafd8b3050e502a16f03ee288c1bb9c21b6
Component: engine
2013-08-06 18:31:05 -07:00
Jérôme Petazzoni 437d59d219 Let userland proxy handle container-bound traffic
Upstream-commit: fea2d5f2fe81d983efbdd803cef2fd1c70f98ebc
Component: engine
2013-08-06 17:44:39 -07:00
Jérôme Petazzoni 217ae3229e change network range to avoid conflict with EC2 DNS
Upstream-commit: 9f1c9686e0ee47289adeeedd6cf8d5296a058463
Component: engine
2013-08-06 17:24:10 -07:00
Andy Rothfusz 2b2233fe77 Suggest installing linux-headers by default. Address #1187 and #1031
Upstream-commit: e0a6f27d1bbf053baf8a94c87fddd3f9ed30964c
Component: engine
2013-08-06 13:56:29 -07:00
Andy Rothfusz 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
shin- cc9d593d21 brew: added support for push on private registries.
Upstream-commit: 65c8e9242cc73fd2f1ea949703cf7da34e8e9650
Component: engine
2013-08-06 21:08:27 +02:00
Thatcher Peskens 5081a0aa8b changed the twitter handle
Upstream-commit: 1d654f615673aecb32011bd5a28c2ac43dbbc1fb
Component: engine
2013-08-06 11:40:16 -07:00