6f5edad812
Fix docker ps truncate long image name by default
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3fcf481361400acd5e56da2a8c76cf888092b2e4
Component: engine
2015-10-02 22:56:42 +08:00
568946688a
Merge pull request #16385 from RichardScothern/v1-deprecation
...
Add a daemon flag to prevent contact with v1 registries.
Upstream-commit: 85244f80e324428cef3dc526d1c831ed20eac6c2
Component: engine
2015-09-30 10:10:06 -07:00
f40e350889
Command line, manpage and deprecation documentation.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
Upstream-commit: 4acf29a80813c8f14174390fbaf5cb74c4a7fadc
Component: engine
2015-09-28 10:31:04 -07:00
f935cc47fb
Merge pull request #16229 from icecrime/discovery
...
Add builtin nodes discovery
Upstream-commit: 9324b154d27643caed58c12e8c49630eeceb4fda
Component: engine
2015-09-27 18:06:27 -07:00
71b700b568
Merge pull request #16109 from charleswhchan/patch-3
...
Touch up "Dockerfile reference"
Upstream-commit: 486c12525f27dd51c89cde910c5ea06665824095
Component: engine
2015-09-27 15:12:17 -07:00
2f753b8d99
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 >
Upstream-commit: 60f76bbfe1baaa0c1cc94b997022df6b8c44f07f
Component: engine
2015-09-27 08:04:36 -07:00
1775a6e17a
Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page
...
cleaning up the first few paragraphs of getting started with containers
Upstream-commit: 1cab5a50d095e25b20e8ec93a13b985909f30f7d
Component: engine
2015-09-27 08:02:14 -07:00
798ccba56f
Merge pull request #16338 from twaugh/env-replacement-label
...
Add documentation note that LABEL allows environment replacement
Upstream-commit: f8f03a290c98063936643c26a0345439a25fe1a7
Component: engine
2015-09-27 08:00:53 -07:00
ff72d92410
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 >
Upstream-commit: 7d193ef1f3b5fcd6aa55b7376116e2617be12e06
Component: engine
2015-09-25 14:52:09 -07:00
58c0f4ebe8
Merge pull request #14579 from hqhq/hq_add_softlimit
...
Add support for memory reservation
Upstream-commit: 84b53c8d87c0ab887209a51e54fad60a591e737a
Component: engine
2015-09-24 12:11:36 -07:00
c78406d3a6
Update documentation for new test log format.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 6fe38e3947c0e744c4f6c48956044fc99a577806
Component: engine
2015-09-24 09:47:42 +08:00
4422b77499
Merge pull request #16415 from HuKeping/dockerinfo
...
Format output of docker info
Upstream-commit: 40e856041265d6030768286f1b228f042c0f768b
Component: engine
2015-09-23 21:15:23 -04:00
d8d1fffffc
Merge pull request #16528 from gesellix/docs-container-commit
...
fix content-type of response for `/commit`
Upstream-commit: 40adb3fd2cd6a10faa44bbd49a9364e2d71cefe9
Component: engine
2015-09-23 15:38:38 -07:00
a5a5293d43
Merge pull request #16346 from cpswan/fixes-15792
...
Clarify when keys are created
Upstream-commit: 871daf5498b4211a23ca5150444ed713d8cfd1d7
Component: engine
2015-09-23 15:29:06 -07:00
a505c19468
fix content-type of response for /commit
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 78de066a28c5e01524401840ff4d1ae76e8e0fc2
Component: engine
2015-09-23 23:49:16 +02:00
e2a6738cd5
fixed jira DTR-1173 typo in link and additional edits
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
Upstream-commit: 3e6991f35c6b98f3503cc81f166420645e7d3c9e
Component: engine
2015-09-23 12:33:45 -07:00
75633de557
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 >
Upstream-commit: 141e91c4803124bdf55dd45a06998748b0ef5fb2
Component: engine
2015-09-23 14:35:13 +08:00
4f3fe3187a
Add support for memory reservation
...
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: aa1780997f42a3fbe3a7f9c7be2b8a5092b9b7c1
Component: engine
2015-09-23 14:02:45 +08:00
cca18b2305
Merge pull request #16428 from charleswhchan/fix-logs-doc
...
Touch up 'docker logs' documentation.
Upstream-commit: bfc785bf6409419cbedde4af3057ab921a5e17d8
Component: engine
2015-09-22 07:17:26 -07:00
3ddae4e8f1
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 >
Upstream-commit: eff524e19cb2cb6fcd6630e0aff7979e3507768c
Component: engine
2015-09-21 19:47:33 -07:00
36e8a28c25
Merge pull request #16465 from albers/reference-capability-all
...
reference: capability `all` should be `ALL`
Upstream-commit: 985b7ec895e75337056e8db1d7fa28e15c0b8180
Component: engine
2015-09-21 16:49:17 -04:00
022c1e60a2
reference: capability all should be ALL
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d37674b44b4b843dcdd2626b58645d9ffef2cb6e
Component: engine
2015-09-21 21:09:50 +02:00
a3f8f51f2a
Merge pull request #15029 from azurezk/add-version-info
...
Add docker version info in /info request
Upstream-commit: 40edb5f97c3ba95e450c8280b29d0ef027b51cfb
Component: engine
2015-09-21 11:44:11 -07:00
c8b313872b
Merge pull request #16449 from runcom/add-container-label-userguide
...
docs: userguide: add container labels section
Upstream-commit: f018c0430bd9a2c8dfe415aeb11e0ede2b435773
Component: engine
2015-09-21 10:26:20 -07:00
8e71940329
add docker server version to /info
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 7cf343d1064e3d8211597c67574ff4ddff316fa1
Component: engine
2015-09-21 21:15:32 +08:00
361e22d91a
docs: userguide: add container labels section
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 124540c08603f1eda956f16e2eef2f42d3b3e80f
Component: engine
2015-09-21 14:41:22 +02:00
d572cd9e37
Merge pull request #16174 from sallyom/man-restart-fix
...
docker restarts running OR stopped containers
Upstream-commit: 4a6e8c8f3c8d129bb06922a0d8e1e1276c254f66
Component: engine
2015-09-20 18:10:06 -07:00
fe1da9c698
Merge pull request #16425 from charleswhchan/fix-version-doc
...
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Upstream-commit: 4133401bf992826e4923d0734e4f09c4c7f68882
Component: engine
2015-09-20 14:33:47 -07:00
4168ba7ed4
docker restarts running OR stopped containers, docs edit rm "running"
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: e41753678d5ffd6c505f1984943bc36d34e134bb
Component: engine
2015-09-20 09:16:27 -04:00
ca451265c5
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 8d6796f8c63ae09ce35a56525a947ae1aa887b0b
Component: engine
2015-09-19 08:53:11 -07:00
282912af5d
Add timeout description.
...
It is almost impossible to take serveral minutes to complete all the
test.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 76c96da4878a8b4ca6f5c9628448fa04401a32ec
Component: engine
2015-09-19 10:24:16 +08:00
64aea80dba
Merge pull request #16349 from cpuguy83/16302_deprecate_autocreate_binds
...
deprecate bind path auto-create
Upstream-commit: e61abac5fa1c1ce2330e34c8eb51d9592dde2dd3
Component: engine
2015-09-18 12:53:06 -07:00
cdae9e4a30
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 >
Upstream-commit: 4026512a2c535fe377a4cf834b7a78fccfd82dab
Component: engine
2015-09-18 13:15:26 -04:00
4e8ec3d151
deprecate bind path auto-create
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 249f45bcfe1adf4b3550306951f2768b17802217
Component: engine
2015-09-18 10:28:38 -04:00
a822a73647
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
Upstream-commit: d09da26f06f36d0ac9616e9b9113b267bc593b70
Component: engine
2015-09-18 10:10:10 +01:00
238b3791d0
Merge pull request #15327 from flavio/update-suse-docs
...
Update SUSE docs
Upstream-commit: d2e7ba42b10fda5961470adc4ba4d74011203e60
Component: engine
2015-09-17 16:46:26 -07:00
c5612022ae
Merge pull request #16271 from runcom/deprecate-cli-opts
...
Deprecate -c cli short variant flag in docker run
Upstream-commit: 4702d45599bf69b525a58c804d175732b934591e
Component: engine
2015-09-17 11:52:59 -07:00
3794bfe695
from make file to Makefile
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 5e7895ee2159552ddd65a91f38bd87a1999328a0
Component: engine
2015-09-17 15:37:50 +00:00
0351ae3d97
Deprecate -c cli short variant flag in docker run
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: e5a26ec0814eebca59ecde38b1aaa5a7de4013fb
Component: engine
2015-09-17 15:48:48 +02:00
ee9bd9e809
Merge pull request #15182 from mapuri/build-arg
...
Support for passing build-time variables in build context
Upstream-commit: 1ffff4c8e2b208664b6f63ea6cd3c4c3dace3cc9
Component: engine
2015-09-16 23:52:37 -04:00
c2bb8dcb02
Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag
...
log driver - Interpolate fields into log tag
Upstream-commit: 4dfa996cc246691de5e6f509939b96e8643ac228
Component: engine
2015-09-16 23:33:34 -04:00
be5aed80c9
Merge pull request #16269 from moxiegirl/fixes-15790
...
Clarifying use of flag
Upstream-commit: 3394fedf3282aedb16c6f3576e0aec721e7e8286
Component: engine
2015-09-17 00:23:25 +02:00
bd692d4b30
log driver - add ability to interpolate container context into the log tag field
...
Signed-off-by: Philip Monroe <phil@philmonroe.com >
Upstream-commit: 3be7146e14d1f5ced470c0c7e3066f091f468696
Component: engine
2015-09-16 15:19:28 -07:00
655513db24
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
5e58ae50d3
Merge pull request #15786 from HuKeping/stats-network
...
Refactor the statistics of network in docker stats
Upstream-commit: 259a0fb16ceac921763172127183059dea7e3c46
Component: engine
2015-09-16 20:29:16 +02:00
c2bbdd98b1
Clarifying use of flag
...
Updating with Seb's comments
Updating with comments from review
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: a2f545c86d37635d3a9f8fa869356218d6991c16
Component: engine
2015-09-16 11:22:40 -07:00
5b99d6a57b
Merge pull request #16292 from tpounds/fix-doc-typo
...
Fix minor documentation typo.
Upstream-commit: 60db152b209ede8e463b74459902f02d8d44e097
Component: engine
2015-09-16 11:18:17 -07:00
fd675380c0
Revert "Make daemon to start with no userlandproxy by default"
...
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
0b8d66eb11
Add documentation note that LABEL allows environment replacement
...
Signed-off-by: Tim Waugh <twaugh@redhat.com >
Upstream-commit: ea4d70bdfd55ee2018674e5878031566e58b8fd1
Component: engine
2015-09-16 14:47:01 +01:00
2051b748c0
incorporate doc review comments
...
Signed-off-by: Madhav Puri <madhav.puri@gmail.com >
Upstream-commit: 8cfcd8738070f24bd66e3b7ed46c6459df3fa9a3
Component: engine
2015-09-16 03:31:15 -07:00
