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
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
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
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
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
d457571635
rebase master
...
Upstream-commit: 946bbee39a33b229b9da39e0f2062d43dde8dcee
Component: engine
2013-08-05 16:25:42 +00:00
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
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
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
9ddc15ebda
Minor typos found while reading docs
...
Upstream-commit: ce97a71adf879a228f352ee10b7fb62ff86bc4e6
Component: engine
2013-08-05 22:47:16 +08:00
d445832a9e
added tests for 1405
...
Upstream-commit: d00fb4096700cd8feed06ca32c93f080fb6446b1
Component: engine
2013-08-05 09:30:27 -05:00
fe0fe92945
fix entrypoint without cmd
...
Upstream-commit: 0f249c85ea9acc7fba33994aa5d20a897463db2c
Component: engine
2013-08-05 09:07:03 -05:00
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
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
bd5fa21461
add docs
...
Upstream-commit: a97cf23355e661d0336a71b5225ad463efa41297
Component: engine
2013-08-05 11:07:27 +00:00
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
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
026e661083
Reduce connect and read timeout when pinging the registry (fixes issue #1363 )
...
Upstream-commit: c860945be25c7768ee456b5a71524631ec0dddbd
Component: engine
2013-08-04 17:42:24 -07:00
8681336287
'Base' is depreciated and should no longer be referenced in the docs.
...
https://groups.google.com/forum/\#!topic/docker-club/pEjqMgcrnqA
Upstream-commit: 51d0c9238bb01088c08048e022b948a292f815ab
Component: engine
2013-08-05 01:34:32 +03:00
7c9fe26485
bash commands while in the container aren't in the transcript! Added.
...
Upstream-commit: 22df1249b582a80f0a1c57d647549d0b91f1cb30
Component: engine
2013-08-04 08:26:56 -05:00
e591df1e08
typo: s/connexions/connections
...
Upstream-commit: db0ccaac9b4e9e12d4e33e5d48e437771aaf8dcd
Component: engine
2013-08-03 22:11:59 -05:00
b034acd005
Clarify Amazon EC2 installation type
...
Make clear this documentation is about installing docker on EC2 with the
help of vagrant, which doesn't make it easy to start multiple instances,
instead of plain vanilla EC2 installation.
Upstream-commit: 708cd3458696101a4aa78d4e8086a29158e133cf
Component: engine
2013-08-03 17:31:20 +07:00
6b62e3168d
Merge pull request #1298 from crosbymichael/1246-auth-request
...
* Registry: Do not require login unless 401 is received on push
Upstream-commit: 4dcc0f316c6dbcad3932b483ad0946a4b7d526cc
Component: engine
2013-08-02 17:39:54 -07:00
3029f070e6
Return JSONError for HTTPResponse error
...
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
2013-08-03 00:27:58 +00:00
a616b1d2ff
Merge pull request #1375 from grobie/patch-1
...
Move note about officially supported kernel
Upstream-commit: b1d994e3b93280bbe55d208c51e4d9fa712f388f
Component: engine
2013-08-02 17:24:15 -07:00
46b9c95887
Fix TestEnv
...
Upstream-commit: dde8f74ceae83f26386ec29e42f615fdc7945e80
Component: engine
2013-08-02 15:58:10 -07:00
2a3da65093
Merge pull request #1388 from titanous/revert-vagrant-bind
...
Revert "Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304 "
Upstream-commit: 9e3d18e6068340f673bca79c3703517e0b538e83
Component: engine
2013-08-02 15:26:05 -07:00
71b5dff299
Consider empty /etc/resolv.conf as local dns + add unit test
...
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
2013-08-02 15:23:36 -07:00
48643d0043
Revert "Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304 "
...
This reverts commit bdc79ac8b2dfad302f9e144711067a566726cfa2.
Upstream-commit: 07fee445593982ef9063a184c05ba93ecacd2e65
Component: engine
2013-08-02 19:18:02 -03:00
294e6e6582
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
...
Upstream-commit: b6bff0cbb15535b3d1bc991b975c3df35061aa83
Component: engine
2013-08-02 15:10:57 -07:00
f9de212d00
Merge pull request #1384 from crosbymichael/1326-build-without-cache
...
* Builder: Add no cache for docker build
Upstream-commit: ead7eb619ed5a60a5ffab62827aa4a3c761504e8
Component: engine
2013-08-02 14:38:34 -07:00
13233c6186
Merge pull request #1350 from ndarilek/1348-add-hostname-to-environment
...
Runtime: add hostname to environment
Upstream-commit: 29de2432eaf4fdb3d1545693d9c80af4538dbda3
Component: engine
2013-08-02 13:58:43 -07:00
d99bd7febd
Merge pull request #1117 from dotcloud/add_last_version-feature
...
Add last stable version in `docker version`
Upstream-commit: ffcba1236c3ba743b8920c6bf559fe2aa55daf25
Component: engine
2013-08-02 13:53:33 -07:00
b6c9a46ec6
Merge pull request #1336 from dotcloud/fix_ADD_permissions
...
Builder: Make sure ADD will create everything in 0755
Upstream-commit: 0f088d28c52f9163f1d50336b9da9cf770c955b9
Component: engine
2013-08-02 13:52:19 -07:00
fa165e7be8
Merge pull request #1346 from dotcloud/1117-update_latest_in_dockerbuilder
...
update http://get.docker.io/latest
Upstream-commit: 16917275ee13c67752f14325cbfe4c3512572654
Component: engine
2013-08-02 13:51:23 -07:00
96cf1ff846
Merge pull request #1343 from dotcloud/ufw_doc
...
Add ufw doc
Upstream-commit: 09ab2bfa1d7597fbaadef98ce74817152f225365
Component: engine
2013-08-02 13:33:26 -07:00
