Commit Graph
22634 Commits
Author SHA1 Message Date
Victor Vieux 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
Michael Crosby 6ad1290069 Use mime types to parse Content-Type
Upstream-commit: 754ed9043d6e1fed98160c7fb443bed0a9464acf
Component: engine
2013-08-06 15:57:13 +00:00
Victor Vieux 82d1681ff0 fix small \n error un docker build
Upstream-commit: ba17f4a06a75a66e11b6cf2ca2cdb5bee4f7bfa8
Component: engine
2013-08-06 14:31:51 +00:00
Manuel Meurer f5e3a27080 Fix indentation in Vagrantfile
Upstream-commit: b9149f45bf6bdef3b7025fe7c94a930696a4b4ab
Component: engine
2013-08-06 15:21:26 +02:00
Victor Vieux 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
Nan Monnand Deng 4260a5cc23 fixing #910
Upstream-commit: 965de6ef50ceb479168c9e4f7156fe2b855e4245
Component: engine
2013-08-05 23:37:53 -04:00
Nan Monnand Deng 2eadef5023 Added index address into APIInfo.
Upstream-commit: 303490168fb53af2528375ca9ec818c7a179a044
Component: engine
2013-08-05 23:36:55 -04:00
Michael Crosby 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
Guillaume J. Charmes dc3db8316e Make sure all sources have the wanted revision
Upstream-commit: 120a520a225725475348b718a81562c6d6c1da86
Component: engine
2013-08-05 19:58:48 -07:00
Andy Rothfusz 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
Jérôme Petazzoni 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
Michael Crosby 810e95ee21 Change daemon to listen on unix socket by default
Upstream-commit: 8934f13615e95a0c9f4bc52eefb5c97360e114f3
Component: engine
2013-08-06 00:12:56 +00:00
Guillaume J. Charmes 74373c4d59 Update utils_test.go
Upstream-commit: dcf9dfb12961fc8101624af0b925d026fde4cde1
Component: engine
2013-08-05 16:32:25 -07:00
Andy Rothfusz 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
Andy Rothfusz 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
Thatcher Peskens 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
Thatcher 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
Guillaume J. Charmes 5e3a4de02f Update version.
Upstream-commit: 590fc58de70bb281812371be6e44ccb7d73d3ec6
Component: engine
2013-08-05 14:49:37 -07:00
Guillaume J. Charmes 4b74bc802f Update CHANGELOG.md
Upstream-commit: c03561eea84f88d0eeddd84a7021876852c0a7c0
Component: engine
2013-08-05 14:32:54 -07:00
Nan Monnand Deng 3eb7f19fae fixed #910. print user name to docker info output
Upstream-commit: 4179f25286dde9f9e83bffa07c303373844b5ed2
Component: engine
2013-08-05 17:25:29 -04:00
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Andy Rothfusz 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
Andy Rothfusz 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
Guillaume J. Charmes 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
Andy Rothfusz 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
Michael Crosby 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
shin- 54865cc8e5 Adapted tests to latest registry changes
Upstream-commit: 8aa9985ad07f71fa9bd3b31dde81c0da6d0dc655
Component: engine
2013-08-05 20:28:05 +02:00
shin- 67eddf7cb1 Cleanup
Upstream-commit: 2c85b964e3be0f7ca3ff513b855f7bd26b936cc9
Component: engine
2013-08-05 19:07:23 +02:00
shin- 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
shin- 779219a1f1 gofmt
Upstream-commit: 484ba4a8c5cd4c06330bdd5fb58f98f07619e2aa
Component: engine
2013-08-05 19:06:00 +02:00
shin- d6b8f8b07e New registry unit tests remade from scratch, using the mock registry
Upstream-commit: 97b7b173b999c7422a3b045c3ceffa331a7239ca
Component: engine
2013-08-05 19:06:00 +02:00
shin- 4d1189a20d Mock registry: Fixed a bug where the index validation path would return a 200 status code instead of the expected 204
Upstream-commit: 29f69211c957a62f13b10036a579191a920f62a7
Component: engine
2013-08-05 19:06:00 +02:00
shin- 64f23d891d registry: Fixed a bug where token and cookie info wouldn't be sent when using LookupRemoteImage(). Fixed a bug where no error would be reported when getting a non-200 status code in GetRemoteImageLayer()
Upstream-commit: 553ce165c1235542d3a5dd526c063c7a4b9904f4
Component: engine
2013-08-05 19:05:14 +02:00
Sam Alba 4732ba2be6 Disabled test server in the tests
Upstream-commit: 310ddec823cbeadf694c396b27b5610474f05bcc
Component: engine
2013-08-05 19:02:57 +02:00
Sam Alba 8bf1856b5c Mocked registry: Added X-Docker-Size when fetching the layer
Upstream-commit: 6926ba558f14da4e48ff5c409a5e78f1e9e0e991
Component: engine
2013-08-05 19:02:57 +02:00
Sam Alba 90a0202ee8 Fixed mocked registry
Upstream-commit: 97d1d6f5d20c1475b7cdfcecdf4eeba08de888bd
Component: engine
2013-08-05 19:02:57 +02:00
Sam Alba 31aa6c5787 Implemented a Mocked version of the Registry server
Upstream-commit: 5f7abd5347fc28ff36b59a03a90dceee22e16606
Component: engine
2013-08-05 19:02:57 +02:00
Victor Vieux d457571635 rebase master
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
Victor Vieux 396e083d45 Merge pull request #1405 from jonasi/entrypoint-noargs
*Runtime: Allow ENTRYPOINT without CMD
Upstream-commit: bdc0e8f82507160d6b00feb00cc5bdb0af95c293
Component: engine
2013-08-05 09:00:39 -07:00
Victor Vieux 438461c454 Merge pull request #1408 from dotcloud/1407-localhost_is_a_domain-fix
Always consider localhost as a domain name when parsing the FQN repos name
Upstream-commit: 1b08ab92d15765f961cb48fa764e8719a7486baf
Component: engine
2013-08-05 08:50:12 -07:00
Victor Vieux c5da071b25 Merge pull request #1382 from monnand/650-http-utils
650 http utils and user agent field
Upstream-commit: feda3db1dd1c76d2866c2a628e28a4999b5b88da
Component: engine
2013-08-05 08:49:12 -07:00
Andrew Macgregor 9ddc15ebda Minor typos found while reading docs
Upstream-commit: ce97a71adf879a228f352ee10b7fb62ff86bc4e6
Component: engine
2013-08-05 22:47:16 +08:00
Isao Jonas d445832a9e added tests for 1405
Upstream-commit: d00fb4096700cd8feed06ca32c93f080fb6446b1
Component: engine
2013-08-05 09:30:27 -05:00
Isao Jonas fe0fe92945 fix entrypoint without cmd
Upstream-commit: 0f249c85ea9acc7fba33994aa5d20a897463db2c
Component: engine
2013-08-05 09:07:03 -05:00
Ken Cochrane 8f44de0140 Merge pull request #1400 from gorsuch/doc-typo
* Documentation: fix a typo in the ubuntu installation guide
Upstream-commit: a37b42b57cd1f372c1583fa3b46b30120401e2ff
Component: engine
2013-08-05 07:05:27 -07:00
Victor Vieux 0d7e5a8037 Merge pull request #1182 from dotcloud/change_build_usage
change tag -> repository name (and optionally a tag) in build usage
Upstream-commit: dd8c59892c791b468bcde219cfeb2adb5e7a702a
Component: engine
2013-08-05 04:08:33 -07:00
Victor Vieux bd5fa21461 add docs
Upstream-commit: a97cf23355e661d0336a71b5225ad463efa41297
Component: engine
2013-08-05 11:07:27 +00:00
Victor Vieux 37bc41c2c0 Merge pull request #1389 from dotcloud/1373-improve_checklocaldns
Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 030cc8d5cc2df5a8f8f6acb3724c1e6016363d95
Component: engine
2013-08-05 02:29:36 -07:00
Sam Alba 193eaad413 Always consider localhost as a domain name when parsing the FQN repos name
Upstream-commit: c22f2617ad8ed2450d4d9dbb6e6ec39da4e51f2f
Component: engine
2013-08-04 17:59:12 -07:00