Commit Graph

714 Commits

Author SHA1 Message Date
fefd04077b Merge pull request #2482 from elee/patch-1
correct assignment of $PORT from docker port output
Upstream-commit: d5891f9fb08d8366dc213465e105ed2e3036b264
Component: engine
2013-10-31 12:18:24 -07:00
f1d3f730e4 Merge pull request #2475 from dudebout/patch-2
Fixes the password value in the redis/links example
Upstream-commit: 09607bb8f68e6fe45c90514c6acd13d0a6e7087b
Component: engine
2013-10-31 12:17:43 -07:00
f28b4da1c3 Merge pull request #2477 from dudebout/patch-3
Fixes typo in the CLI documentation
Upstream-commit: 35044efce55bb07b7309f10129c91bcc14cb513a
Component: engine
2013-10-31 12:17:06 -07:00
76a46c89b0 Merge pull request #2462 from tlunter/fix_remote_api_doc
Fix formatting on build-an-image-from-dockerfile-via-stdin
Upstream-commit: 54024ddd8a38881be173eb3124c4019e4ce381ea
Component: engine
2013-10-31 10:56:38 -07:00
73541bce08 Fixes another instant of the password
Upstream-commit: 7e7c931d2b6d667ed97957df37e26b49888933c1
Component: engine
2013-10-31 08:55:14 -04:00
bf5d4694b4 Fixed the quoted text
Upstream-commit: 3a14d4c923109b93ba805e661fa1573c3b2f9db7
Component: engine
2013-10-31 08:46:16 -04:00
02e12e8500 correct assignment of $PORT from docker port output
in the example, PORT is assigned to "0.0.0.0:<port>" vs "<port>" as in previous versions of docker (I encountered this documentation discrepancy tonight after installing docker v0.6.5)
Upstream-commit: df1621914b56b4ed20f684363247a9bb0c7acebf
Component: engine
2013-10-31 01:08:16 -04:00
17e208649c Fix typo
Upstream-commit: f77bbfca56e45b4cb405ecb5f2c950c294375b59
Component: engine
2013-10-31 00:07:58 -05:00
3c41e18387 Fixes typo in the CLI documentation
Upstream-commit: 87a250b71186547312dc7b5f6960aae485a465cd
Component: engine
2013-10-30 23:09:02 -04:00
5dfb155fe5 Fixes the password value in the redis/links example
Upstream-commit: ccc1a5dcfb78de8718df08db9e09ea17d9723a16
Component: engine
2013-10-30 22:52:47 -04:00
1e48612a2b Merge pull request #2470 from metalivedev/2369-docuncompress
Documenting decompression behavior.
Upstream-commit: c1c65f972a0db81be9415c330493e7d76d3a6501
Component: engine
2013-10-30 19:14:51 -07:00
a162db7be1 Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
2013-10-30 18:57:07 -07:00
67b88fd430 Add flags to history, add size flag
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
ddf4ad8def Fix #2369 by documenting decompression behavior.
Upstream-commit: 26f4d6bf59bee7cd4290ea4e31a19da087a180f2
Component: engine
2013-10-30 16:50:58 -07:00
ce829b0604 Merge pull request #2274 from peterbraden/2137-docs
Re #2137 Note about vagrant dns in the test documentation
Upstream-commit: bdd12bb7037d3e34cf294adafc6cabaf12f7cc77
Component: engine
2013-10-30 16:32:35 -07:00
4c6143c7d7 Update links and host integration documentation
Upstream-commit: a4d97a4e80d569181835b7d55348dc755f48ce25
Component: engine
2013-10-30 11:59:05 -07:00
068d1a3e59 Fix formatted on build
Upstream-commit: e7402ed9cc823045a75baef32a090607f7272078
Component: engine
2013-10-30 08:50:21 -04:00
3d88facaa2 Merge pull request #2426 from dotcloud/enable_sigproxy_default
Enable sig-proxy by default in run and attach
Upstream-commit: caa7cf14c009d8a8341423c981801512a74b9204
Component: engine
2013-10-29 14:39:17 -07:00
82ec27b71b Merge pull request #2429 from SvenDowideit/add-more-doc-pointers
tell potential doc updaters and contributors more details
Upstream-commit: 02e0fdee5788c6fe51136d991f8d6af3f8491ea4
Component: engine
2013-10-29 14:07:12 -07:00
9ea897f40d Merge pull request #2443 from tlunter/fix_remote_api_doc
Container commit doesn't use a query parameter, uses POST body
Upstream-commit: baf23d3c3e91eaa721e817e236b2f25f17d6786a
Component: engine
2013-10-29 14:04:22 -07:00
c452ed1a32 Enable sig-proxy by default in run and attach
Upstream-commit: e0b59ab52b87b8fc15dd5534c3231fdd74843f9f
Component: engine
2013-10-29 11:18:34 -07:00
72fb377123 Update all older docs too
Upstream-commit: 4f5790d10407e143f9d42a75eb4800cfe3f49263
Component: engine
2013-10-29 13:57:42 -04:00
a7c955ab40 Doesn't use a query parameter, uses POST body
Upstream-commit: 70c976de03ae5b83952e7ddfadfc75e358c5bbef
Component: engine
2013-10-29 10:17:12 -04:00
39bb284f54 Expose IP, port, proto as sep. env vars when linking, Closes #2430
Upstream-commit: 1de23f1b81956bc04ba047d066ff7d84d9162910
Component: engine
2013-10-28 23:02:28 -07:00
ed387ea493 docker stop sends SIGTERM and SIGKILL, docker kill sends SIGKILL
Upstream-commit: 82f15148955124c20cb756502036c4f231e5a8aa
Component: engine
2013-10-29 13:37:43 +10:00
5d5ae2293c add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
Upstream-commit: e47f9984f8a2a250c980dd9325f6ac24a55093ed
Component: engine
2013-10-29 12:58:58 +10:00
c2ea5a00ce Merge pull request #2162 from dotcloud/links
Links and Container Naming
Upstream-commit: b038b0cd44e152fa4158f2bfe145de6d774dd8d0
Component: engine
2013-10-28 19:24:10 -07:00
7ce1e20657 Add -name for docker run
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
43f9ad0fc4 Fixes the flags for nc
The `-p` flag for `nc` should not be used with `-l`.
Upstream-commit: 50bb4a1636ea84d90700c2dce308670c9715d378
Component: engine
2013-10-28 15:48:18 -04:00
a4dd698ace Merge pull request #2413 from rutsky/patch-1
Fix typo
Upstream-commit: 3c0c75bbf9ddd335439d40139358f46fd9532fc7
Component: engine
2013-10-28 12:08:04 -07:00
e13ba798d9 fix typo
Upstream-commit: 395a24ffd5a34f2fe1e5d7b7b5ee6c7825f51581
Component: engine
2013-10-28 09:35:09 +03:00
b9f7264616 Fix typo
Upstream-commit: 45d94944f3afe32d04eb31faa0cd9a129383f42c
Component: engine
2013-10-28 02:45:12 +03:00
bdda0e729a fix typo in docs
Upstream-commit: 99a9783abcf5db6ead15228fcf7bc962fff548f5
Component: engine
2013-10-25 15:13:24 -07:00
f85e0d3aec Remove docker ls from docs and cli usage
Upstream-commit: 515070d5138c205e65cd029443c84408ad593ef6
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
ce1466ed6d Typo in host integration docs
Upstream-commit: 33ccd29ae7b6e9c8e5b463c7066426f825c74d0a
Component: engine
2013-10-23 10:19:12 -05:00
185088440f Merge pull request #2261 from edmund-wagner/master
make copy paste user friendly
Upstream-commit: 81866087fe6260eccfd9490f990ad01fec911b15
Component: engine
2013-10-22 11:31:49 -07:00
f2236c43dc Merge pull request #2318 from Tranquility/master
Fix github link in docs
Upstream-commit: 3bd45824da739d98745193e68c15e85edbbb7b60
Component: engine
2013-10-22 09:55:33 -07:00
fcf658a6b5 Clean up level 3 headers.
Upstream-commit: a1fc8e17a79818977375d5e97a1afdc5f2d2fca8
Component: engine
2013-10-21 14:03:09 -07:00
4785dd0921 Fix github link in docs
Upstream-commit: f903feee03d4df4361c79a44b6f5d78d4718b350
Component: engine
2013-10-21 22:58:56 +02:00
8f6b16d850 Fix #2302
Upstream-commit: bba5fd455567f831270ff60bd6991481d5340958
Component: engine
2013-10-18 18:00:44 -07:00
295b7a4df7 Update documentation
Upstream-commit: 8cf0f2dbe54e5ff5175a830af30ba428f8b1f526
Component: engine
2013-10-18 16:26:29 -07:00
b3613b29c9 Fix issue killing container while sending signal
Fix rebase issue
Update docs
Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1
Component: engine
2013-10-18 16:19:27 -07:00
02bbabf14d Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
4b6a99ff24 Merge pull request #2222 from tianon/debootstrap
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
Upstream-commit: 4b7c071e9c1f2ec839e2d4f5be915850405a8686
Component: engine
2013-10-18 14:46:14 -07:00
ce87496ba9 Clean up build warnings. Remove redundant files.
Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0
Component: engine
2013-10-17 17:57:01 -07:00
71320cc1e8 Re #2137 Note about vagrant dns in the test documentation
Upstream-commit: 3db381bf086215ff9d29cf55cb55d7fa086f990d
Component: engine
2013-10-17 13:38:39 -07:00
438bef9430 c&p improvement for 13.04
first line killed sources list
Upstream-commit: bc39ac71e66327aa73c44633b374ef75630909dc
Component: engine
2013-10-17 10:07:12 +02:00
e2a6017ff6 make copy paste user friendly
copying only the first line killed my sources.list file
Upstream-commit: 2110b3cca80da253d2fd7443480509a3b58a19e2
Component: engine
2013-10-17 09:31:35 +02:00
2c8dcaacd9 Revert "Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example."
This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630.
Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a
Component: engine
2013-10-16 14:38:24 -07:00