4c1540c8d2
Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles
...
Don't put dockerfiles in one continuous code block
2015-10-07 13:40:19 -07:00
8e31036816
Merge pull request #16645 from mavenugo/ux
...
Docker Network UX & remote API changes
2015-10-07 10:44:58 -07:00
a1c373197f
Merge pull request #16807 from jfrazelle/rename-flag
...
change flag name to better follow the other flags that start with disable
2015-10-07 10:40:32 -07:00
c559d8ebf7
change flag name to better follow the other flags that start with disable;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-07 10:16:37 -07:00
dd28ded711
Networking API and UX documentation
...
More doc updates will follow
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-07 03:54:27 -07:00
4cb0790a62
Mention more realistic examples are available
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-07 11:45:57 +01:00
6a1a192e07
Don't put dockerfiles in one continuous code block
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-06 22:58:42 +01:00
51e059e7e9
devmapper: Provide option to enabled deferred device deletion
...
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.
Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-10-06 17:37:21 -04:00
e1d3cb89f1
Merge pull request #16647 from vdemeester/revert-env-validation-docs
...
Update documentation on the revert on env validation
2015-10-05 15:27:45 -07:00
0339ed787c
Merge pull request #16747 from vdemeester/docs-testdirs
...
Update test-and-docs with TESTDIRS
2015-10-05 10:39:56 -07:00
ec1d8d7f2a
Merge pull request #16662 from moxiegirl/install-via-rpm
...
Updating the installations with rpm and yum install
2015-10-05 09:46:53 -07:00
b3fe785c72
Update documentation on the revert on env validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 23:04:36 +02:00
67eb810a60
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
2015-10-04 22:28:19 +02:00
14e8898648
Fix man and commandline docs
...
- missing help option in `docs/reference/commandline/*.md` (some files
have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-04 21:22:27 +02:00
0542939f40
Update test-and-docs with TESTDIRS
...
… and fix the rendering of `make test-unit` with TESTDIRS :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 21:19:04 +02:00
5e061b5945
Updating the installations with rpm and yum install
...
Prefer rpm/yum over script install
Updating with review comments
Adding second round review comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-04 11:29:58 -07:00
c1713e7c5a
Documentation for filtering events by label
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 16:45:08 -04:00
2d43d93410
Make exec start return proper error codes
...
Exec start was sending HTTP 500 for every error.
Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.
Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-02 14:40:22 -04:00
d6f8365258
Merge pull request #16680 from dnephin/update_list_image_api_docs
...
Update api docs for /images/json
2015-10-02 11:23:49 -07:00
3fcf481361
Fix docker ps truncate long image name by default
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-02 22:56:42 +08:00
85244f80e3
Merge pull request #16385 from RichardScothern/v1-deprecation
...
Add a daemon flag to prevent contact with v1 registries.
2015-09-30 10:10:06 -07:00
e5967d041d
Fix api documenation for /images/json response format
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-30 12:24:34 -04:00
4acf29a808
Command line, manpage and deprecation documentation.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-09-28 10:31:04 -07:00
9324b154d2
Merge pull request #16229 from icecrime/discovery
...
Add builtin nodes discovery
2015-09-27 18:06:27 -07:00
486c12525f
Merge pull request #16109 from charleswhchan/patch-3
...
Touch up "Dockerfile reference"
2015-09-27 15:12:17 -07:00
60f76bbfe1
Touch up "Dockerfile reference"
...
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109 )
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-27 08:04:36 -07:00
1cab5a50d0
Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page
...
cleaning up the first few paragraphs of getting started with containers
2015-09-27 08:02:14 -07:00
f8f03a290c
Merge pull request #16338 from twaugh/env-replacement-label
...
Add documentation note that LABEL allows environment replacement
2015-09-27 08:00:53 -07:00
7d193ef1f3
Add builtin nodes discovery
...
Use `pkg/discovery` to provide nodes discovery between daemon instances.
The functionality is driven by two different command-line flags: the
experimental `--cluster-store` (previously `--kv-store`) and
`--cluster-advertise`. It can be used in two ways by interested
components:
1. Externally by calling the `/info` API and examining the cluster store
field. The `pkg/discovery` package can then be used to hit the same
endpoint and watch for appearing or disappearing nodes. That is the
method that will for example be used by Swarm.
2. Internally by using the `Daemon.discoveryWatcher` instance. That is
the method that will for example be used by libnetwork.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-25 14:52:09 -07:00
84b53c8d87
Merge pull request #14579 from hqhq/hq_add_softlimit
...
Add support for memory reservation
2015-09-24 12:11:36 -07:00
6fe38e3947
Update documentation for new test log format.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-24 09:47:42 +08:00
40e8560412
Merge pull request #16415 from HuKeping/dockerinfo
...
Format output of docker info
2015-09-23 21:15:23 -04:00
40adb3fd2c
Merge pull request #16528 from gesellix/docs-container-commit
...
fix content-type of response for `/commit`
2015-09-23 15:38:38 -07:00
871daf5498
Merge pull request #16346 from cpswan/fixes-15792
...
Clarify when keys are created
2015-09-23 15:29:06 -07:00
78de066a28
fix content-type of response for `/commit`
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-09-23 23:49:16 +02:00
3e6991f35c
fixed jira DTR-1173 typo in link and additional edits
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
2015-09-23 12:33:45 -07:00
141e91c480
Format output of docker info
...
Format those info which will only be displayed when daemon is
in debug mode.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-23 14:35:13 +08:00
aa1780997f
Add support for memory reservation
...
Signed-off-by: qhuang <qhuang@10.0.2.15>
2015-09-23 14:02:45 +08:00
bfc785bf64
Merge pull request #16428 from charleswhchan/fix-logs-doc
...
Touch up 'docker logs' documentation.
2015-09-22 07:17:26 -07:00
eff524e19c
Touch up 'docker logs' documentation.
...
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-21 19:47:33 -07:00
985b7ec895
Merge pull request #16465 from albers/reference-capability-all
...
reference: capability `all` should be `ALL`
2015-09-21 16:49:17 -04:00
d37674b44b
reference: capability `all` should be `ALL`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-21 21:09:50 +02:00
40edb5f97c
Merge pull request #15029 from azurezk/add-version-info
...
Add docker version info in /info request
2015-09-21 11:44:11 -07:00
f018c0430b
Merge pull request #16449 from runcom/add-container-label-userguide
...
docs: userguide: add container labels section
2015-09-21 10:26:20 -07:00
7cf343d106
add docker server version to /info
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-09-21 21:15:32 +08:00
124540c086
docs: userguide: add container labels section
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-21 14:41:22 +02:00
4a6e8c8f3c
Merge pull request #16174 from sallyom/man-restart-fix
...
docker restarts running OR stopped containers
2015-09-20 18:10:06 -07:00
4133401bf9
Merge pull request #16425 from charleswhchan/fix-version-doc
...
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
2015-09-20 14:33:47 -07:00
e41753678d
docker restarts running OR stopped containers, docs edit rm "running"
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-09-20 09:16:27 -04:00
8d6796f8c6
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-19 08:53:11 -07:00
moxiegirl