1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

404 Commits

Author SHA1 Message Date
Victor Vieux
d8352677c8 Merge branch 'master' into 1237-improve_docker_top-feature
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
Victor Vieux
091d56f759 Merge pull request #1342 from dsissitka/patch-4
Fixed a couple of minor syntax errors.
Upstream-commit: f2dc49292f775f4c10fc61157cac0b8e15315917
Component: engine
2013-07-30 04:20:05 -07:00
dsissitka
86d430ea32 Fixed a couple of minor syntax errors.
Upstream-commit: 9ba998312de5826f24f693c8518ecda700135b4b
Component: engine
2013-07-30 01:39:29 -04:00
Thatcher Peskens
7e99f4ac78 Updated the description of run -d
The goal is to make it more clear this will give you the container id after run completes.

Since stdout is now standard on run, "docker run -d" is the best (or only) way to get the container ID returned from docker after a plain run, but the description (help) does not hint any such thing.
Upstream-commit: 5dc86d7bca17c2996264a18cc26f06d30e532588
Component: engine
2013-07-29 14:17:15 -07:00
Solomon Hykes
d391806121 Clean up 'manifesto' in docs
Upstream-commit: a97d858b2a0d6bc4d044a241036b97fd78f93022
Component: engine
2013-07-26 10:21:17 -07:00
Victor Vieux
71ca6b4378 fix docs
Upstream-commit: 513a5674831fd952fc8e7b8fbdbc4939393ecb5b
Component: engine
2013-07-26 10:04:46 +00:00
Andy Rothfusz
41fd022aa4 Merge pull request #1274 from dhrp/headings_website
Removed website and updated headings.
Upstream-commit: 422378cb85b1a158373ea8e5a2dc2de92076d225
Component: engine
2013-07-25 16:43:27 -07:00
Guillaume J. Charmes
8ad99ad99c Merge pull request #1288 from dlintw/1286-improve-import-txz-description
Fixes #1286 improve-import-txz-description
Upstream-commit: 9cc8b72a38491efbaf86f3d13689bc13ef74d32d
Component: engine
2013-07-25 12:37:37 -07:00
Daniel YC Lin
c0c3fbc7b6 Fixes #1286
Upstream-commit: 8f6b6d57840410d1491321d7681ef2a946e90bc9
Component: engine
2013-07-25 15:36:32 +08:00
Victor Vieux
743adaf705 add kernel version
Upstream-commit: 6057e6ad70ba4550df358e89b9a7e1da61666604
Component: engine
2013-07-24 13:36:55 +00:00
Victor Vieux
764ae64982 Merge branch 'master' into 1167_events_endpoint-feature
Upstream-commit: ee05f97c9a8542ded8631a33e343f07f1cecd4de
Component: engine
2013-07-24 11:49:04 +00:00
Thatcher Peskens
ff1a26c4e5 Docs: Fixed navigaton links to about page and community page
Website: Removed the website sources from the repo. The website sources are now hosted on github.com/dotcloud/www.docker.io/
Upstream-commit: e701dce33978a0206627a02b258da6a0269c4b60
Component: engine
2013-07-23 13:05:06 -07:00
Victor Vieux
96e4d0d309 Merge branch 'stfp-858-disable-network-configuration'
Upstream-commit: a93a87f64a97f36121dbf3a58fff762f94e5dd73
Component: engine
2013-07-23 19:55:50 +00:00
Victor Vieux
8aa1b36505 Merge pull request #1241 from ryfow/patch-1
Make the ENTRYPOINT example work
Upstream-commit: dfc64d157a2a8c387b56a3eea501c726a93f41d0
Component: engine
2013-07-23 08:45:04 -07:00
Victor Vieux
05d166e113 add docs
Upstream-commit: ec559c02b8dd70692821b3dc7f497d6fccaa88ad
Component: engine
2013-07-23 15:42:34 +00:00
Victor Vieux
be9f5063e4 Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration
Upstream-commit: 8165e51eccd15b7eed3939ada6017ed12b9e81b3
Component: engine
2013-07-23 08:44:12 +00:00
Thatcher Peskens
fab05b9aee Added new docker logo to the documentation header, and added other links.
Upstream-commit: 58a1c5720a42fde72c27532ce1122609225bc3bb
Component: engine
2013-07-22 20:26:40 -07:00
Victor Vieux
2e339a6cec Merge branch 'master' into 1237-improve_docker_top-feature
Conflicts:
	docs/sources/api/docker_remote_api.rst
Upstream-commit: c81662eae473e2b35e4e449be18cc6dfda07e4ec
Component: engine
2013-07-22 16:22:11 +00:00
Victor Vieux
e57c33a063 Merge pull request #1158 from cespare/1142-docker-add-fix
*Buildfile: determine a filename from a URL if the destination is a directory
Upstream-commit: 4e7f2b757e9b5c1a0960553938570bee2a54e0c6
Component: engine
2013-07-22 07:07:04 -07:00
Ken Cochrane
ab81112793 Merge pull request #1259 from dsissitka/patch-3
*Documentation: Updated the stop command's docs.
Upstream-commit: 2bba279cf18ac3a58b59633b0c6757c03328cb10
Component: engine
2013-07-22 06:59:02 -07:00
Ken Cochrane
cae7a0b314 Merge pull request #1258 from dsissitka/patch-2
* Documentation: Added top to the list of commands in the sidebar.
Upstream-commit: 56da77a548cb335bbb44e58bde3ffb003679c67d
Component: engine
2013-07-22 06:58:09 -07:00
Caleb Spare
e3ecb715a3 Update ADD documentation to specify new behavior.
Upstream-commit: c383d598809daec6bccd60bd211c10f6a4ef60b0
Component: engine
2013-07-21 23:32:06 -07:00
Caleb Spare
ed8e1bd7e6 Remove some trailing whitespace.
Upstream-commit: 416fdaa3d5d7b84f7e36fdfcff7153e3a38262c9
Component: engine
2013-07-21 23:32:06 -07:00
Stefan Praszalowicz
edbf8f58a1 Support networkless containers with new docker run option '-n'
Upstream-commit: 3342bdb33184b83cac66921807c5403168d13f6b
Component: engine
2013-07-21 17:11:47 -07:00
David Sissitka
52d2580351 Updated the stop command's docs.
Upstream-commit: 1d02a7ffb63915055f5fd9bda420bd08a8679da1
Component: engine
2013-07-21 19:00:18 -04:00
dsissitka
d051cf7ec4 Added top to the list of commands in the sidebar.
Upstream-commit: 788935175e8500b451a844f6971ac62dd099bdfc
Component: engine
2013-07-21 18:30:51 -04:00
dsissitka
885edf50ba Fixed a couple of minor syntax errors.
Upstream-commit: 32663bf431b64d1169509bacba36e3c90e131b44
Component: engine
2013-07-20 21:27:55 -04:00
Andy Rothfusz
a8e35fc588 Merge pull request #1235 from metalivedev/cleandocbld
Make docs build without warnings or errors. Minor additional cleanup.
Upstream-commit: 23ea9b8968b5c79760e5dbe4e6e92e1e05fe7361
Component: engine
2013-07-19 09:44:53 -07:00
Ryan Fowler
1ef21555e9 Make the ENTRYPOINT example work
The incantation listed in the ENTRYPOINT example didn't actually pass the arguments to your script. Changing the definition to an array fixes this.
Upstream-commit: e8ad82f9ba126414e1813fadfb17167a34afa8d4
Component: engine
2013-07-19 10:11:21 -05:00
unclejack
59b7a438c9 docs - add example for cidfile
Upstream-commit: 2a3b91e3b66c48c6a26dbd673957a46c1afacbbe
Component: engine
2013-07-19 16:03:45 +03:00
unclejack
ce2e737919 docs - add cidfile flag to run docs
Upstream-commit: 221ee504aa06d06eb868898cca2fcc020a861e84
Component: engine
2013-07-19 16:03:45 +03:00
Victor Vieux
797b7b513b bump api version to 1.4
Upstream-commit: eb4a0271fbb7318a7d66911ccd388c048db0c2fa
Component: engine
2013-07-19 10:34:55 +00:00
Andy Rothfusz
7bd70e19f4 Make docs build without warnings or errors. Minor additional cleanup.
Upstream-commit: 54f9cdb0c30ef7d192c4ae59c669a7a5fd7d1003
Component: engine
2013-07-18 19:04:51 -07:00
Andy Rothfusz
97e62e30e8 Make dockerfile docs easier to find. Clean up formatting.
Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630
Component: engine
2013-07-17 18:56:40 -07:00
Andy Rothfusz
3e4e3b1c00 Merge pull request #1219 from metalivedev/docs-repoupdate
Update docs with 0.5 repository information.
Upstream-commit: 3dbf9c6560fe1741cde9e8e2ce6ac98acf26e8ce
Component: engine
2013-07-17 13:53:12 -07:00
Guillaume J. Charmes
2b2f5cce76 Merge pull request #1194 from crosbymichael/build-verbose
* Builder: Add verbose output to docker build
Upstream-commit: de563a3ea372432acb39e711eeb0b43296754c39
Component: engine
2013-07-17 12:53:06 -07:00
Victor Vieux
a44b5f6d5b change rm usage in docs
Upstream-commit: 9cf2b41c053d557af6c563311b4953c4b9bab6d6
Component: engine
2013-07-17 19:24:54 +00:00
Victor Vieux
aa3ed33e67 Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master
Upstream-commit: f310b875f8972870e87e4395b5dbd8613b66fa39
Component: engine
2013-07-17 19:23:06 +00:00
Andy Rothfusz
2953a9d955 Update repository information.
Upstream-commit: 0356081c0ad2f1d95fb435f9a491f7a7a63cbf33
Component: engine
2013-07-16 17:04:41 -07:00
Guillaume J. Charmes
a4a2ab57ce Update docs
Upstream-commit: 18e91d5f85a008ef48d724db964330ddaa1bbf10
Component: engine
2013-07-16 10:14:21 -07:00
Ken Cochrane
aa8559ee18 updated the rmi command docs, the had typos
Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698
Component: engine
2013-07-12 14:05:26 -04:00
Michael Crosby
3442b5e984 Add param to api docs for verbose build output
Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9
Component: engine
2013-07-12 06:22:56 -09:00
Victor Vieux
6ed4740f8b Merge pull request #1197 from crosbymichael/buildfile-doc-ordering
Fix Docker Builder documentation section numbers
Upstream-commit: 8e6c249e485a8cce37dbfb6b897730bca8bbdca8
Component: engine
2013-07-12 05:27:47 -07:00
Victor Vieux
5d09c440fb Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
* Client: Add options to docker login to be able to use it via script
Upstream-commit: 752f99e8a18a5e16f2a93b0fac1984b3a4412346
Component: engine
2013-07-12 05:07:25 -07:00
Victor Vieux
c22c23bfc2 Merge branch 'master' into list_container_processes-feature
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
Michael Crosby
6a215f8175 Fix Docker Builder documentation numbering
Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e
Component: engine
2013-07-11 16:41:19 -09:00
Michael Crosby
015f243412 Add verbose output to docker build
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
Upstream-commit: 474191dd7bca9eedaccb9de1771eecfce7dfebbb
Component: engine
2013-07-11 15:27:33 -09:00
Guillaume J. Charmes
900f657bd8 Merge pull request #1124 from crosbymichael/buildfile-volumes
+ Builder: Add VOLUME instruction to buildfile
Upstream-commit: 637eceb6a797df45b99f3ea929f7900e75e5fc97
Component: engine
2013-07-11 17:16:57 -07:00
Michael Crosby
7935041f18 Add VOLUME instruction to buildfile
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
Solomon Hykes
63618e51b5 Fix outdated docs explaining how to setup a dev environment. Building docker with docker ftw
Upstream-commit: a839b36e55da231874b312ee184c9d8164460bdc
Component: engine
2013-07-09 16:48:16 -07:00