Commit Graph

49 Commits

Author SHA1 Message Date
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
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
c0c3fbc7b6 Fixes #1286
Upstream-commit: 8f6b6d57840410d1491321d7681ef2a946e90bc9
Component: engine
2013-07-25 15:36:32 +08: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
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
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
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
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
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
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
ab729772a8 change to top
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
2e70c0f0f0 Add Entrypoint to builder and container config
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
4b2d50c5e8 rebase master
Upstream-commit: 3b5ad44647bf4033502594a4048bffea656b2a08
Component: engine
2013-07-01 12:31:16 +00:00
5783230d1b Add doc
Upstream-commit: 8589fd6db8d52f93ba64a0d72c6eebe8d50530f6
Component: engine
2013-06-28 18:05:41 +02:00
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
9d597b11de Merge pull request #848 from dotcloud/builder_server-3
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
fa5ff73c73 add options to docker login
Upstream-commit: 42bcfcc927499c63bbc3e3de80e6f52fd02fc9e8
Component: engine
2013-06-21 10:00:25 +00:00
3b9f55c51c docs: mark command as optional for docker run
Upstream-commit: 6a1279fb90ad33fec05a48529981db7bb093b782
Component: engine
2013-06-21 11:07:14 +03:00
0c8eff63fa Update documentaiton
Upstream-commit: 84ceeaa8708293de81765a0f854952a74d191024
Component: engine
2013-06-18 14:36:35 -07:00
726da1690f Merge branch 'master' into builder_server-3
Conflicts:
	utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
2013-06-14 17:08:39 -07:00
4bc27f700a Add examples for local import.
Upstream-commit: 7958f1f694ac411dcfeb8fbf0d702a7c552306ae
Component: engine
2013-06-14 13:42:59 -06:00
18df81b8e1 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -07:00
6bcd65ddd0 Fix typo in docs
Upstream-commit: 8984aef8999509e5e6a1cb70286e44d0508f93e0
Component: engine
2013-06-10 09:32:31 -07:00
f2a91760de Update documentation for docker build
Upstream-commit: 2cc22de696d5a0847ecd7d07eaee1d7f385dd29c
Component: engine
2013-06-06 16:48:36 -07:00
8fe98b929a docs: build: ADD copies just needed data w/ full path
Upstream-commit: 4b3a381f39bc90b36877f4832fe5c53de65a1ec3
Component: engine
2013-06-07 00:39:43 +03:00
ed288324ad docs: warn about build data tx & ADD w/o context
This updates the documentation to mention that:
1. a lot of data may get sent to the docker daemon if there is a lot of
data in the directory passed to docker build
2. ADD doesn't work in the absence of the context
3. running without a context doesn't send file data to the docker
daemon
4. explain that the data sent to the docker daemon will be used by ADD
commands
Upstream-commit: efa7ea592c1819f006acf9480c10e50ec63b3001
Component: engine
2013-06-06 22:06:12 +03:00
fc9613526d Update docker build docs
Upstream-commit: 28d5b2c15acc6e088a0abd2099a00ba1180beb3e
Component: engine
2013-05-30 12:35:19 -07:00
41337f44f2 Update build doc
Upstream-commit: 92939569ab06d13cd179d6e998ef9576d3921bb6
Component: engine
2013-05-29 11:53:44 -07:00
cbcfc9c00c Update docker build docs
Upstream-commit: d97fff60a9275324290bb01b921c9b6b0967a4fd
Component: engine
2013-05-29 11:50:49 -07:00
349847e8ba Fixing two typos in the run help
Upstream-commit: 9e0427081e80dbf6c7702c8428ec64e40f362804
Component: engine
2013-05-23 18:09:59 +03:00
7040df6614 added/modifed tittle, description and keywords
changed the title prefix to sufix + Documentation
Upstream-commit: 18cb5c9314dbc9a0aa857211b124a3feb85c5274
Component: engine
2013-05-22 17:52:48 -07:00
3980cc1280 Merge branch 'master' of github.com:dotcloud/docker into 471-cpu-limit
Upstream-commit: 6f3e868a7b8f239334d06b2385b776ce7ae5614f
Component: engine
2013-05-10 14:44:50 -07:00
85073c6e30 Moved the static website html pages to their own folder under docs.
This should make previewing documentation easier.
Also updated the Makefile to now copy the theme dir into the _build/website/ dir. Make connect and Make push work.
Upstream-commit: 0f4469c2b1164eab9bc6104913cf8dccacac214f
Component: engine
2013-05-08 17:05:46 -07:00
8ac133e820 if -c is not specified, do not set cpu.shares (instead of using the default value of 1024)
Upstream-commit: e36752e03347bf46177d8ee810cdd5a019321dc9
Component: engine
2013-05-07 11:43:45 -07:00
443030ccf1 implement "-c" option to allocate a number of CPU shares to a container
Upstream-commit: efd9becb78c82ddef07efb7e76e0100d7a712281
Component: engine
2013-05-07 11:16:30 -07:00
918b8e4e00 Added actual doc file
Upstream-commit: 82513815f1d2bee77ae729b4293e29d6377ab03d
Component: engine
2013-05-07 10:31:55 -07:00
1fe09c7f12 Merge pull request #497 from justone/dot-graph-images
+ images: output graph of images to dot (graphviz)
Upstream-commit: 8472a27e80849318161ed7d8f30a8b431b1571a8
Component: engine
2013-05-06 17:48:07 -07:00
cb5a080cbe Add doc for the builder
Upstream-commit: bbb634a98068171b6b6f4bbb9c7160284ef252e4
Component: engine
2013-05-06 16:01:00 -07:00
b23bef294e add doc for images -viz
Upstream-commit: 359ecf88de8b1ed4392ff82aac276353d5d664f0
Component: engine
2013-05-03 21:12:43 -07:00
64cd9c2d11 Fix typo for command run docs
Upstream-commit: 1617a18258ccc7e07f30aef02a9b085627eb388a
Component: engine
2013-05-02 12:11:57 -07:00
9951e24504 Update docs for Command Run
Upstream-commit: 21b9dcd518871088086943f95bf39f068b30691f
Component: engine
2013-05-02 09:26:29 -07:00
10952020e0 Update commandline Commit doc
Upstream-commit: c20e46587d3fb09257e6ce7d085467da403210ee
Component: engine
2013-05-01 15:43:02 -07:00
8ee2fa2877 move each command description into a separate document
Upstream-commit: cf8b8c1969daa423a1308561f3c1b2b863c64655
Component: engine
2013-04-03 15:55:18 +03:00