centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 08:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,632 Commits 54 Branches 28 Tags
830729bb94e8af8e6d9967da77673c13119cc00a
Commit Graph

4172 Commits

Author SHA1 Message Date
Lei Jitang
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
Arnaud Porterie
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
Richard Scothern
4acf29a808 Command line, manpage and deprecation documentation. 
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
 2015-09-28 10:31:04 -07:00
Andrea Luzzardi
9324b154d2 Merge pull request #16229 from icecrime/discovery 
Add builtin nodes discovery
 2015-09-27 18:06:27 -07:00
moxiegirl
486c12525f Merge pull request #16109 from charleswhchan/patch-3 
Touch up "Dockerfile reference"
 2015-09-27 15:12:17 -07:00
Charles Chan
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
moxiegirl
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
moxiegirl
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
Arnaud Porterie
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
Jess Frazelle
84b53c8d87 Merge pull request #14579 from hqhq/hq_add_softlimit 
Add support for memory reservation
 2015-09-24 12:11:36 -07:00
Yuan Sun
6fe38e3947 Update documentation for new test log format. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-09-24 09:47:42 +08:00
Brian Goff
40e8560412 Merge pull request #16415 from HuKeping/dockerinfo 
Format output of docker info
 2015-09-23 21:15:23 -04:00
Jess Frazelle
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
Jess Frazelle
871daf5498 Merge pull request #16346 from cpswan/fixes-15792 
Clarify when keys are created
 2015-09-23 15:29:06 -07:00
Tobias Gesellchen
78de066a28 fix content-type of response for /commit 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-09-23 23:49:16 +02:00
Carol Fager-Higgins
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
Hu Keping
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
qhuang
aa1780997f Add support for memory reservation 
Signed-off-by: qhuang <qhuang@10.0.2.15>
 2015-09-23 14:02:45 +08:00
moxiegirl
bfc785bf64 Merge pull request #16428 from charleswhchan/fix-logs-doc 
Touch up 'docker logs' documentation.
 2015-09-22 07:17:26 -07:00
Charles Chan
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
Tibor Vass
985b7ec895 Merge pull request #16465 from albers/reference-capability-all 
reference: capability `all` should be `ALL`
 2015-09-21 16:49:17 -04:00
Harald Albers
d37674b44b reference: capability all should be ALL 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-21 21:09:50 +02:00
Alexandre Beslic
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
moxiegirl
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
Zhang Kun
7cf343d106 add docker server version to /info 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-09-21 21:15:32 +08:00
Antonio Murdaca
124540c086 docs: userguide: add container labels section 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-09-21 14:41:22 +02:00
David Calavera
4a6e8c8f3c Merge pull request #16174 from sallyom/man-restart-fix 
docker restarts running OR stopped containers
 2015-09-20 18:10:06 -07:00
moxiegirl
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
Sally O'Malley
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
Charles Chan
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
Yuan Sun
76c96da487 Add timeout description. 
It is almost impossible to take serveral minutes to complete all the
test.

Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-09-19 10:24:16 +08:00
David Calavera
e61abac5fa Merge pull request #16349 from cpuguy83/16302_deprecate_autocreate_binds 
deprecate bind path auto-create
 2015-09-18 12:53:06 -07:00
Vincent Batts
4026512a2c events/jsonmessage: add and prefer TimeNano for events 
This way provide both Time and TimeNano in the event. For the display of
the JSONMessage, use either, but prefer TimeNano Proving only TimeNano
would break Subscribers that are using the `Time` field, so both are set
for backwards compatibility.

The events logging uses nano formatting, but only provides a Unix()
time, therefor ordering may get lost in the output. Example:
```
2015-09-15T14:18:51.000000000-04:00 ee46febd64ac629f7de9cd8bf58582e6f263d97ff46896adc5b508db804682da: (from busybox) resize
2015-09-15T14:18:51.000000000-04:00 a78c9149b1c0474502a117efaa814541926c2ae6ec3c76607e1c931b84c3a44b: (from busybox) resize
```

By having a field just for Nano time, when set, the marshalling back to
`time.Unix(sec int64, nsec int64)` has zeros exactly where it needs to.
This does not break any existing use of jsonmessage.JSONMessage, but now
allows for use of `UnixNano()` and get event formatting that has
distinguishable order. Example:
```
2015-09-15T15:37:23.810295632-04:00 6adcf8ed9f5f5ec059a915466cd1cde86a18b4a085fc3af405e9cc9fecbbbbaf: (from busybox) resize
2015-09-15T15:37:23.810412202-04:00 6b7c5bfdc3f902096f5a91e628f21bd4b56e32590c5b4b97044aafc005ddcb0d: (from busybox) resize
```

Including tests for TimeNano and updated event API reference doc.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-09-18 13:15:26 -04:00
Brian Goff
249f45bcfe deprecate bind path auto-create 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-09-18 10:28:38 -04:00
Chris Swan
d09da26f06 Clarify when keys are created and fix missing of 
Signed-off-by: Chris Swan <chris.swan@iee.org>

Conflicts:
	docs/security/trust/content_trust.md
 2015-09-18 10:10:10 +01:00
moxiegirl
d2e7ba42b1 Merge pull request #15327 from flavio/update-suse-docs 
Update SUSE docs
 2015-09-17 16:46:26 -07:00
Jess Frazelle
4702d45599 Merge pull request #16271 from runcom/deprecate-cli-opts 
Deprecate -c cli short variant flag in docker run
 2015-09-17 11:52:59 -07:00
Yuan Sun
5e7895ee21 from make file to Makefile 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-09-17 15:37:50 +00:00
Antonio Murdaca
e5a26ec081 Deprecate -c cli short variant flag in docker run 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-09-17 15:48:48 +02:00
Tibor Vass
1ffff4c8e2 Merge pull request #15182 from mapuri/build-arg 
Support for passing build-time variables in build context
 2015-09-16 23:52:37 -04:00
Brian Goff
4dfa996cc2 Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag 
log driver - Interpolate fields into log tag
 2015-09-16 23:33:34 -04:00
Sebastiaan van Stijn
3394fedf32 Merge pull request #16269 from moxiegirl/fixes-15790 
Clarifying use of flag
 2015-09-17 00:23:25 +02:00
Philip Monroe
3be7146e14 log driver - add ability to interpolate container context into the log tag field 
Signed-off-by: Philip Monroe <phil@philmonroe.com>
 2015-09-16 15:19:28 -07:00
Tim Hockin
3d4685e258 Add support for DNS options 
Signed-off-by: Tim Hockin <thockin@google.com>
 2015-09-16 14:06:45 -07:00
Sebastiaan van Stijn
259a0fb16c Merge pull request #15786 from HuKeping/stats-network 
Refactor the statistics of network in docker stats
 2015-09-16 20:29:16 +02:00
Mary Anthony
a2f545c86d Clarifying use of flag 
Updating with Seb's comments
Updating with comments from review

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-16 11:22:40 -07:00
David Calavera
60db152b20 Merge pull request #16292 from tpounds/fix-doc-typo 
Fix minor documentation typo.
 2015-09-16 11:18:17 -07:00
Jessica Frazelle
50d7fba775 Revert "Make daemon to start with no userlandproxy by default" 
This reverts commit bf2b8ec816.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-16 09:56:38 -07:00
Tim Waugh
ea4d70bdfd Add documentation note that LABEL allows environment replacement 
Signed-off-by: Tim Waugh <twaugh@redhat.com>
 2015-09-16 14:47:01 +01:00
Madhav Puri
8cfcd87380 incorporate doc review comments 
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
 2015-09-16 03:31:15 -07:00