Andy Rothfusz
906b481148
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
2013-12-13 14:29:14 -08:00
Guillaume J. Charmes
9a9ecda7c8
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
2013-12-13 13:56:35 -08:00
Andy Rothfusz
1e85aabf71
Fix #1695 by adding more about logging.
2013-12-13 11:42:58 -08:00
WarheadsSE
a68d7f3d70
Add -bip flag: allow specification of dynamic bridge IP via CIDR
...
e.g.:
```
docker -d -bip "10.10.0.1/16"
```
If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
2013-12-13 10:47:19 -05:00
Andy Rothfusz
036f41fde3
Merge pull request #3165 from SvenDowideit/cmd-rmi-example
...
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 13:57:13 -08:00
Sven Dowideit
7edd1f6bad
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 15:54:34 +10:00
Sven Dowideit
d878632b25
add a direct example for changing the cmd that is run
2013-12-11 12:07:07 +10:00
Andy Rothfusz
4bea68dfa6
Clean up quoting, wraps, and build error on code-block.
2013-12-05 17:16:31 -08:00
Andy Rothfusz
ea0ed9a915
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
2013-12-05 17:03:26 -08:00
Andy Rothfusz
0189a99471
Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
...
Some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 15:25:09 -08:00
Guillaume J. Charmes
ef157cee30
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
2013-12-05 14:13:03 -08:00
Michael Crosby
697707e4af
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
2013-12-05 14:03:23 -08:00
Sven Dowideit
04c32495f6
add a little prose to tell the user that run creates a container, and then starts it
2013-12-05 14:20:16 +10:00
Sven Dowideit
af020e2d67
I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 14:14:08 +10:00
Sven Dowideit
48e1766527
add an example of docker ps, and also of link aliases
2013-12-03 17:57:51 +10:00
Dustin Sallings
4ad3dfb05f
CLI docs and examples of format
2013-12-02 11:07:41 -08:00
Victor Vieux
4b35c1b6a6
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
2013-12-02 10:59:15 -08:00
Guillaume J. Charmes
62b1faf28c
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
2013-11-29 18:49:24 -08:00
Sven Dowideit
ba5268d382
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
2013-11-29 11:22:17 +10:00
Michael Crosby
1fe1b216ad
Return process exit code for attach
...
Fixes #2240
2013-11-28 15:25:50 -08:00
Alexis THOMAS
2c27da8818
Restore 'save' paragraph
2013-11-28 00:39:06 +01:00
Solomon Hykes
1d903da6fd
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
2013-11-25 18:58:26 -08:00
Solomon Hykes
43c7df946d
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-26 02:00:25 +00:00
Andy Rothfusz
33f70f8978
Merge pull request #2725 from SvenDowideit/docker-export-doc
...
add 'to STDOUT' to the help and give an example
2013-11-25 14:42:57 -08:00
Michael Crosby
d8f4b733f2
Add daemon docs with selecting graph driver
2013-11-25 09:44:55 -08:00
Sven Dowideit
e288e7763e
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
2013-11-23 12:48:34 +10:00
Sven Dowideit
9696ec509a
add 'to STDOUT' to the help, and add a simple eg that mentions it too
2013-11-23 12:28:50 +10:00
Victor Vieux
8498b44eac
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
2013-11-21 15:33:05 -08:00
Andy Rothfusz
9b4c151142
Merge pull request #2717 from metalivedev/2342-uploadingcontext
...
Fix #2342 . Harmonize information about ADD. Cross-link build info.
2013-11-21 15:09:47 -08:00
Andy Rothfusz
82cdd21a34
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
2013-11-20 16:30:48 -08:00
Michael Crosby
2bc35287a0
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
2013-11-20 11:10:13 -08:00
Frederick F. Kautz IV
bf504f2afa
Adding spaces to fix docs build
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
Andy Rothfusz
4f9f83d6c6
Fix #2342 . Harmonize information about ADD. Cross-link build info.
2013-11-19 11:16:28 -08:00
Andy Rothfusz
2ae1f29dfe
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 13:09:13 -08:00
Andy Rothfusz
669e4bac30
Merge pull request #2729 from SvenDowideit/docker-info-doc
...
add example for docker info
2013-11-18 11:44:54 -08:00
Andy Rothfusz
f6362fbb0e
Merge pull request #2726 from SvenDowideit/docker-history-doc
...
add example for docker history
2013-11-18 11:43:44 -08:00
Sven Dowideit
bc74f65068
make the docker commit help more copy&pasteable
2013-11-16 21:11:34 +10:00
Sven Dowideit
5c741ef11d
add example
2013-11-16 20:53:45 +10:00
Sven Dowideit
152459b727
add some common examples for docker images, and tell the user what -a filters out
2013-11-16 20:45:30 +10:00
Sven Dowideit
f04142c1f7
add example for docker history
2013-11-16 20:36:33 +10:00
Sven Dowideit
af05ab399e
add an example of what to expect from docker diff, and what the 3 codes mean
2013-11-16 20:26:47 +10:00
Sven Dowideit
27159ce6ba
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
2013-11-16 20:15:04 +10:00
Andy Rothfusz
69a9614cb4
Merge pull request #2621 from rogaha/rm_del_all_example
...
- Added delete all the containers example (docker rm `docker ps -a -q`)
2013-11-11 14:55:50 -08:00
Victor Vieux
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
Roberto Gandolfo Hashioka
4ec0b51578
- Updated description
2013-11-09 11:08:43 -08:00
Roberto Gandolfo Hashioka
403f9fc357
- Added delete all the containers example
2013-11-08 16:47:42 -08:00
Andy Rothfusz
67b0b97a8f
Merge pull request #2526 from metalivedev/2074-AddKnownIssues
...
Add Known Issue
2013-11-08 12:14:04 -08:00
Victor Vieux
f417c4b099
Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from
2013-11-07 17:59:55 -08:00
Sven Dowideit
01fea3cf11
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
2013-11-08 09:32:13 +10:00