56e5aafa16
CLI docs and examples of format
...
Upstream-commit: 4ad3dfb05f1932793cae5c8047a89660747b95b4
Component: engine
2013-12-02 11:07:41 -08:00
128e1b30b4
Merge pull request #2728 from SvenDowideit/docker-import-doc
...
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Upstream-commit: 4b35c1b6a6167a0dce11cd748c94598199dce942
Component: engine
2013-12-02 10:59:15 -08:00
2c50a80ad5
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
Upstream-commit: 62b1faf28c25a678a50f59251cccd2316239cc4a
Component: engine
2013-11-29 18:49:24 -08:00
98a6754c91
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
...
Upstream-commit: ba5268d382dec7b731717feec77b6e7d2e6cfdaf
Component: engine
2013-11-29 11:22:17 +10:00
36cc89d71d
Return process exit code for attach
...
Fixes #2240
Upstream-commit: 1fe1b216ad9b60f6b25a5dadda5fe26c3602b054
Component: engine
2013-11-28 15:25:50 -08:00
ac3797d133
Restore 'save' paragraph
...
Upstream-commit: 2c27da881807b6c63ef29e8033241a17c76f5ab7
Component: engine
2013-11-28 00:39:06 +01:00
acc5196685
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
Upstream-commit: 1d903da6fd89b0322f76bc91c07fd3dbe4d22099
Component: engine
2013-11-25 18:58:26 -08:00
542c84c74e
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
2013-11-26 02:00:25 +00:00
c1bd7eb1b4
Merge pull request #2725 from SvenDowideit/docker-export-doc
...
add 'to STDOUT' to the help and give an example
Upstream-commit: 33f70f8978b175915fbc71b2e82694c911a69741
Component: engine
2013-11-25 14:42:57 -08:00
5c5c144532
Add daemon docs with selecting graph driver
...
Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4
Component: engine
2013-11-25 09:44:55 -08:00
a62fb77dd4
be very explicit about docker insert - it does not insert a file into an IMAGE, it creates a new image that adds only that file to its specified parent
...
Upstream-commit: e288e7763e20d1d8c7b8f5f9fffa00136577ed95
Component: engine
2013-11-23 12:48:34 +10:00
7ee06b046b
add 'to STDOUT' to the help, and add a simple eg that mentions it too
...
Upstream-commit: 9696ec509a53afaaf9b761b00f60e517634f7e4e
Component: engine
2013-11-23 12:28:50 +10:00
4718170d22
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
2013-11-21 15:33:05 -08:00
1eafcb9d5e
Merge pull request #2717 from metalivedev/2342-uploadingcontext
...
Fix #2342 . Harmonize information about ADD. Cross-link build info.
Upstream-commit: 9b4c15114201bab21437853463d58652c8e1624a
Component: engine
2013-11-21 15:09:47 -08:00
94ec1bcdfe
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
Upstream-commit: 82cdd21a3492789a47fc4c3bb3f8a4d85b89d14c
Component: engine
2013-11-20 16:30:48 -08:00
afc3ae3564
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
Upstream-commit: 2bc35287a080cd9a9805e343595055dcbfb0db01
Component: engine
2013-11-20 11:10:13 -08:00
9f3f248404
Adding spaces to fix docs build
...
Upstream-commit: bf504f2afab679922e92b8bb5fe28957f5f6bf02
Component: engine
2013-11-20 03:52:33 +00:00
390195822f
Offline Image Transfers #1155
...
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
2013-11-20 03:52:33 +00:00
791d32523f
Fix #2342 . Harmonize information about ADD. Cross-link build info.
...
Upstream-commit: 4f9f83d6c6e71f826489f04e497f4a384c49a2c1
Component: engine
2013-11-19 11:16:28 -08:00
814f2e1b4e
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
...
Upstream-commit: 2ae1f29dfe6fea26d2e0ac29faa2375a5db2c2d9
Component: engine
2013-11-18 13:09:13 -08:00
29163ad063
Merge pull request #2729 from SvenDowideit/docker-info-doc
...
add example for docker info
Upstream-commit: 669e4bac30f41c2bebbcae2889fb1420cd41af37
Component: engine
2013-11-18 11:44:54 -08:00
28e01f39d4
Merge pull request #2726 from SvenDowideit/docker-history-doc
...
add example for docker history
Upstream-commit: f6362fbb0ee00aa2a7ac6ca21f8ba1004a135b4c
Component: engine
2013-11-18 11:43:44 -08:00
a69dc14f58
make the docker commit help more copy&pasteable
...
Upstream-commit: bc74f65068b6b80b657e07f4ab2d7b115aacae75
Component: engine
2013-11-16 21:11:34 +10:00
dbb96cce3d
add example
...
Upstream-commit: 5c741ef11db8777bc7723d879624ae8281121c18
Component: engine
2013-11-16 20:53:45 +10:00
dbd9984b5b
add some common examples for docker images, and tell the user what -a filters out
...
Upstream-commit: 152459b7272daa30ab5207b512f5319fdc4ff491
Component: engine
2013-11-16 20:45:30 +10:00
b3d92f6b0f
add example for docker history
...
Upstream-commit: f04142c1f765b4d1afb8eb388f3ca9466c22abf7
Component: engine
2013-11-16 20:36:33 +10:00
83c673a90c
add an example of what to expect from docker diff, and what the 3 codes mean
...
Upstream-commit: af05ab399e17c97bdea4b3ee893c47f29c0e22a5
Component: engine
2013-11-16 20:26:47 +10:00
bc3e877db3
expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path
...
Upstream-commit: 27159ce6bac4308b5fba311258fab8e852667787
Component: engine
2013-11-16 20:15:04 +10:00
1e55bfad23
Merge pull request #2621 from rogaha/rm_del_all_example
...
- Added delete all the containers example (docker rm `docker ps -a -q`)
Upstream-commit: 69a9614cb4654616baf9fb849275d6ec74a13a33
Component: engine
2013-11-11 14:55:50 -08:00
fac387b017
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
...
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
2013-11-11 12:34:16 -08:00
311c5ef875
- Updated description
...
Upstream-commit: 4ec0b515786ce266234d350fee872764974d2218
Component: engine
2013-11-09 11:08:43 -08:00
f4773a7d1f
- Added delete all the containers example
...
Upstream-commit: 403f9fc357d64ccbdf82e1c4cbad2946eb1d1080
Component: engine
2013-11-08 16:47:42 -08:00
08ddb7c17c
Merge pull request #2526 from metalivedev/2074-AddKnownIssues
...
Add Known Issue
Upstream-commit: 67b0b97a8f17c67e5599f4566c8a9e1a5bb401fe
Component: engine
2013-11-08 12:14:04 -08:00
2f4c3fdf6d
Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from
...
Upstream-commit: f417c4b09955e3b250bec19a0d4b13ff30ba4e80
Component: engine
2013-11-07 17:59:55 -08:00
d03901e0ad
Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
...
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
2013-11-08 09:32:13 +10:00
85bf6b92cb
updating cli help doc for images
...
Upstream-commit: 363738b8f21d02c2e4fac84bd2776c2d4a5e6755
Component: engine
2013-11-06 12:03:45 -08:00
2e403649d0
update "images" documentation
...
Upstream-commit: 6d5b73c2a6d668b11d6b5c643a45170265bf73c0
Component: engine
2013-11-06 04:23:07 +00:00
b64b038b00
Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
...
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
Upstream-commit: 962a66cd36a615bb0a7cb9866becdccf4aa97839
Component: engine
2013-11-05 10:29:54 -08:00
6c362cebcc
Add ability to mount volumes in readonly mode using -volumes-from
...
Upstream-commit: f9cb6ae46a3478c19e85a2a159c4ac31223ec499
Component: engine
2013-11-05 11:58:51 -06:00
22e1fc60ec
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
8c3f937eb2
conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
...
Upstream-commit: 1f3cdc11ee0c7088c8619f8b31bcd17ce8b79b79
Component: engine
2013-11-04 22:07:55 +10:00
938714910e
Add known issues. Fix build warnings.
...
Upstream-commit: 5a9adfe9fb5bc988185ef41ca637fbeee73e947c
Component: engine
2013-11-01 16:06:46 -07:00
cbce82a91e
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
2013-11-01 15:21:47 -07:00
f207545b43
Fixed 127.0.0.0 typo in cli.rst
...
Upstream-commit: dcf4633e95c7f3784cb29b9c1f9510af28b882ed
Component: engine
2013-11-01 14:00:02 -07:00
e048f744ba
Merge pull request #2479 from dudebout/port-redirection-doc
...
Port redirection doc
Upstream-commit: 33d8c736fcc0e7fcd18c60ad849caf7e30090755
Component: engine
2013-11-01 13:43:53 -07:00
5287e87035
Merge pull request #2492 from dotcloud/publish-all-flag
...
Add -P flag to publish all exposed ports
Upstream-commit: 65ba2868d7e0084f5edd2fc836d032f39ec39b9a
Component: engine
2013-11-01 10:21:02 -07:00
c0c39b7770
Rework the port direction documentation
...
+ remove PUBLIC and PRIVATE keywords
+ add the <host_interface>
+ add the -expose flag through a simple link example
+ update the meaning of the EXPOSE command
Upstream-commit: c0e51a8f27defe3d4dde0b5805d3801cf25a6ce2
Component: engine
2013-11-01 12:18:04 -04:00
a1a49c8919
Container memory limit can be specified in kilobytes, megabytes or gigabytes
...
-m 10 # 10 bytes
-m 10b # 10 bytes
-m 10k # 10240 bytes (10 * 1024)
-m 10m # 10485760 bytes (10 * 1024 * 1024)
-m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)
Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
Upstream-commit: 9ee9d2f9959390d1cda56accbbd975df18d157ad
Component: engine
2013-11-01 12:00:17 +00:00
47ebac600d
rebase and add some filters
...
Upstream-commit: 747967b4a4e2bfa429a76d20db77b990d23b1a0f
Component: engine
2013-10-31 19:25:55 -07:00
44da76a732
Add -P flag to publish all exposed ports
...
Upstream-commit: 652f07bb59e9c46d5f3e375c4a99d0b23771e0ad
Component: engine
2013-10-31 11:28:30 -07:00
