764ae64982
Merge branch 'master' into 1167_events_endpoint-feature
...
Upstream-commit: ee05f97c9a8542ded8631a33e343f07f1cecd4de
Component: engine
2013-07-24 11:49:04 +00:00
96e4d0d309
Merge branch 'stfp-858-disable-network-configuration'
...
Upstream-commit: a93a87f64a97f36121dbf3a58fff762f94e5dd73
Component: engine
2013-07-23 19:55:50 +00:00
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
05d166e113
add docs
...
Upstream-commit: ec559c02b8dd70692821b3dc7f497d6fccaa88ad
Component: engine
2013-07-23 15:42:34 +00:00
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
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
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
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
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
e3ecb715a3
Update ADD documentation to specify new behavior.
...
Upstream-commit: c383d598809daec6bccd60bd211c10f6a4ef60b0
Component: engine
2013-07-21 23:32:06 -07:00
ed8e1bd7e6
Remove some trailing whitespace.
...
Upstream-commit: 416fdaa3d5d7b84f7e36fdfcff7153e3a38262c9
Component: engine
2013-07-21 23:32:06 -07:00
edbf8f58a1
Support networkless containers with new docker run option '-n'
...
Upstream-commit: 3342bdb33184b83cac66921807c5403168d13f6b
Component: engine
2013-07-21 17:11:47 -07:00
52d2580351
Updated the stop command's docs.
...
Upstream-commit: 1d02a7ffb63915055f5fd9bda420bd08a8679da1
Component: engine
2013-07-21 19:00:18 -04:00
d051cf7ec4
Added top to the list of commands in the sidebar.
...
Upstream-commit: 788935175e8500b451a844f6971ac62dd099bdfc
Component: engine
2013-07-21 18:30:51 -04:00
885edf50ba
Fixed a couple of minor syntax errors.
...
Upstream-commit: 32663bf431b64d1169509bacba36e3c90e131b44
Component: engine
2013-07-20 21:27:55 -04:00
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
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
59b7a438c9
docs - add example for cidfile
...
Upstream-commit: 2a3b91e3b66c48c6a26dbd673957a46c1afacbbe
Component: engine
2013-07-19 16:03:45 +03:00
ce2e737919
docs - add cidfile flag to run docs
...
Upstream-commit: 221ee504aa06d06eb868898cca2fcc020a861e84
Component: engine
2013-07-19 16:03:45 +03:00
7bd70e19f4
Make docs build without warnings or errors. Minor additional cleanup.
...
Upstream-commit: 54f9cdb0c30ef7d192c4ae59c669a7a5fd7d1003
Component: engine
2013-07-18 19:04:51 -07:00
97e62e30e8
Make dockerfile docs easier to find. Clean up formatting.
...
Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630
Component: engine
2013-07-17 18:56:40 -07:00
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
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
a44b5f6d5b
change rm usage in docs
...
Upstream-commit: 9cf2b41c053d557af6c563311b4953c4b9bab6d6
Component: engine
2013-07-17 19:24:54 +00:00
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
2953a9d955
Update repository information.
...
Upstream-commit: 0356081c0ad2f1d95fb435f9a491f7a7a63cbf33
Component: engine
2013-07-16 17:04:41 -07:00
a4a2ab57ce
Update docs
...
Upstream-commit: 18e91d5f85a008ef48d724db964330ddaa1bbf10
Component: engine
2013-07-16 10:14:21 -07:00
aa8559ee18
updated the rmi command docs, the had typos
...
Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698
Component: engine
2013-07-12 14:05:26 -04:00
3442b5e984
Add param to api docs for verbose build output
...
Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9
Component: engine
2013-07-12 06:22:56 -09:00
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
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
c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
6a215f8175
Fix Docker Builder documentation numbering
...
Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e
Component: engine
2013-07-11 16:41:19 -09:00
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
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
7935041f18
Add VOLUME instruction to buildfile
...
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
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
7033d58dca
Fix installation link from welcome page.
...
Upstream-commit: 11998ae7d62ee17856ead81ce49409dc63643d62
Component: engine
2013-07-02 16:48:57 -07:00
d5551edef2
Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
...
Conflicts:
docs/sources/concepts/manifesto.rst
docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine
2013-07-02 15:10:07 -07:00
92fbe05ddb
Cleaning up the welcome page, terminology, and images.
...
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
4deb63608f
Fix broken quickstart link
...
Upstream-commit: 4b8688f1e5a5998e10bdc1d7b39458a611a25eef
Component: engine
2013-07-02 14:10:06 -07:00
b8221b0ce7
Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
...
Conflicts:
docs/sources/concepts/manifesto.rst
Upstream-commit: 55b5889a0fa74db30e6a07f84b02e22ea41c3e19
Component: engine
2013-07-02 13:00:08 -07:00
ad16b4b27c
Shortened lines to 80 columns
...
Upstream-commit: dd4c6f6a09c98f075fc5964242792d9e9f2c20d4
Component: engine
2013-07-02 12:09:57 -07:00
df5dac21e6
Clean up image text, minor updates to docs.
...
Upstream-commit: 6058261a26b9e23926612fddfd8ad37bfcf1dd9c
Component: engine
2013-07-02 12:09:57 -07:00
09eb5cc9ff
Adding files for terms
...
Upstream-commit: b461e4607de497096b0ec92bb05d5a88bfe0e48d
Component: engine
2013-07-02 12:09:57 -07:00
66a935418f
Cleaning up the welcome page, terminology.
...
Upstream-commit: d399f720983d94706bdaae528a2637778ca5b5e0
Component: engine
2013-07-02 12:09:57 -07:00
de55ad0e3d
Clean up image text, minor updates to docs.
...
Upstream-commit: b47873c5accd33964c33f718ceeda955d1a9a3c8
Component: engine
2013-07-01 16:37:13 -07:00
c4bb1a9c18
Adding files for terms
...
Upstream-commit: adf75d402ab428a16ac3d57d0154ddd02be2fb6b
Component: engine
2013-07-01 16:37:13 -07:00
52be3958ff
Cleaning up the welcome page, terminology.
...
Upstream-commit: cb1fdb2f0380e43f38f3b37562edc83122c8349f
Component: engine
2013-07-01 16:37:13 -07:00
4af6128790
Merge pull request #1086 from crosbymichael/1008-image-entrypoint
...
+ Builder: Add Entrypoint to builder and container config
Upstream-commit: 185a2fc55e64a828d8443b912505283b6f8b97d4
Component: engine
2013-07-01 13:33:12 -07:00
