Commit Graph

4493 Commits

Author SHA1 Message Date
9f99937185 Merge pull request #17481 from vdemeester/17446-network-inspect-format
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
476079ebd7 Address review comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a2120e5ba3337f70a63fd64ea773e50ce5af31ca
Component: engine
2015-12-03 16:07:54 +01:00
c7c45c24a8 Add docs and man page entry for --volume-driver
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: fe3ec3f77fd71d8544bc640b3d91f563f7d68013
Component: engine
2015-12-03 16:02:20 +01:00
72c9d02b1c Merge pull request #18301 from wenchma/doc_update_for_net
Add NETWORK_NAME_or_ID value for --net= option
Upstream-commit: ee3e07d3593f97466df6fc11c19f91c1aee76dd4
Component: engine
2015-12-02 22:36:01 +01:00
f437e2a3c8 Add format flag to network inspect
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 295c27388dd1e7cc4196fbb8ffe0646b33bacb5b
Component: engine
2015-12-02 22:32:10 +01:00
15181abee7 Merge pull request #18309 from WeiZhang555/time
Consolidate time format for API
Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30
Component: engine
2015-12-02 22:28:28 +01:00
5811737ebb Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search
Carry 17293 add examples in search
Upstream-commit: d410cd47518b323064994f80022927a45b4e22c2
Component: engine
2015-12-02 21:52:52 +01:00
a7b1157339 Merge pull request #16277 from runcom/add-oom-score-adj
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00
4ceb4f0c9f Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation
[carry] configuring DNS options on systemd
Upstream-commit: f4176f91690a16b08c320984e17c049098d3f1f7
Component: engine
2015-12-02 11:39:18 -08:00
9a973af9b7 Merge pull request #13587 from rhatdan/volume-tmpfs
Add tmpfs as a valid volume source command.
Upstream-commit: d4be46def4660f2dea090646f8d768f38c6fd520
Component: engine
2015-12-02 11:16:49 -08:00
30eb543363 fix minor markup issues
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f2986cee57e1854f3346ca7609740bdd51d0dcb
Component: engine
2015-12-02 17:21:06 +01:00
529645209e Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater
modified note to provide a link for installation instructions on Ubuntu 15.04 or above

cleaned up typos for ubuntulinux.md

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 0fb1845e957353792b39475751221d1b8b66da52
Component: engine
2015-12-02 17:21:05 +01:00
cf1f5d3461 Merge pull request #18350 from duglin/Issue9798a
Deprecate -f flag from docker tag
Upstream-commit: fcccf2dae4770bdb7781d57e20ae94b9565b67ac
Component: engine
2015-12-02 08:16:09 -08:00
26a5e0a515 update order and address review notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 920a2618392d5235b9823b97aeb80ad858639b81
Component: engine
2015-12-02 16:38:51 +01:00
cec860f76a add examples in search.md
Signed-off-by: gwx296173 <gaojing3@huawei.com>
Upstream-commit: 42d4eabeb22f98267c2294bbf7551f1fe0c13cb1
Component: engine
2015-12-02 16:38:51 +01:00
71b21cf347 This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: b3e527dfd242ad30c0297c8b257862116cf2c50e
Component: engine
2015-12-02 10:06:59 -05:00
f2ea55aeff Add NETWORK_NAME_or_ID value for --net= option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
2015-12-02 22:49:35 +08:00
c529eb3ce9 Consolidate time format for API
Consolidate all the API to same time format: RFC3339, and it will be
client's responsibility to present it in more user friendly way.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 9daca1222adabf3aeae97a2c4e5f4ed1bb8c15e1
Component: engine
2015-12-02 22:40:18 +08:00
1e2b4815df Add docs for option --isolation
Add docs for `run`/`create`/`build` command option `isolation`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 38ec5d86a355674cfddf8c998591abb098475bab
Component: engine
2015-12-02 22:24:33 +08:00
2603d9d05a Deprecate -f flag from docker tag
Closes #9798

@maintainers please note that this is a change to the UX. We no longer
require the -f flag on `docker tag` to move a tag from an existing image.
However, this does make us more consistent across our commands,
see https://github.com/docker/docker/issues/9798 for the history.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8d4fe141c4c3f456df9c2be75ffe5071d1665717
Component: engine
2015-12-01 19:53:49 -08:00
efeb394283 docs: fix broken link to 1.7 Hub API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 09742bcd692b2594800631e5c5c16d76dcf0e9f2
Component: engine
2015-12-01 17:57:12 +01:00
2ba0212c1d docs: add API v1.22 to the list again
The 1.22 API was temporarily removed in e4d86c2c38f4c99660da8ed65a8103e283e07e23
to prevent it showing up in the 1.9 documentation.

This reverts that change and tweaks the aligning
of the table headers in Markdown source.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3ddd21b8b66be248ea04eb74c7a81349bffddac1
Component: engine
2015-12-01 11:59:45 +01:00
c21d72b21a Merge pull request #18204 from mavenugo/dhb
Configurable discovery ttl and heartbeat timer
Upstream-commit: 0f0cf267e898f9a84533855304d542f524c814c1
Component: engine
2015-11-30 11:00:53 -08:00
ddf1fb3149 Add OomScoreAdj to configure container oom killer preferences
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: d3af7f283d8dc0be67be48e14cd740fbeb690f7a
Component: engine
2015-11-30 11:19:04 +01:00
97d5f4d62b Use FROM docs/base:latest again
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ce5177cf4b175435a667aeced586f653a9203790
Component: engine
2015-11-26 20:20:46 +10:00
7e8c2fe30e Merge pull request #17799 from runcom/deprecate-hc-cont-start
Deprecate HostConfig at API container start
Upstream-commit: ad67f324cc59807918eea747cc110d39a2bc1ca2
Component: engine
2015-11-25 09:11:12 -08:00
265697d24d Merge pull request #18223 from thaJeztah/fix-table-markup
Fix markup for markdown table
Upstream-commit: 9bd5fd892617c589606efda5e209e2400c6946d7
Component: engine
2015-11-25 16:26:53 +01:00
c05f5f5162 Merge pull request #18233 from moxiegirl/carry-17231
Moving prerequisite from #17231
Upstream-commit: aa4fa98ed77f80a9db5e8f7c23ef58a4537a72e1
Component: engine
2015-11-25 16:12:05 +01:00
2d2b79f090 Merge pull request #18209 from martingkelly/18207-deb-multiarch
install.sh: fix for multiarch deb/ubuntu
Upstream-commit: 1892556375ee4425e7c0a8e3e3cfb5f5e7a2c49c
Component: engine
2015-11-25 16:02:36 +01:00
f09258ddea Merge pull request #17926 from HackToday/15896-fix-volume-options
Fixing the volume options doc
Upstream-commit: afaf288316d0cce4a2d02a51aaab0b8017bdac27
Component: engine
2015-11-25 06:57:05 -08:00
73301b3d57 Make discovery ttl and heartbeat configurable
Docker daemon uses kv-store as the host-discovery backend.
Discovery module tracks the liveness of a node through a simple
keepalive mechanism.  The keepalive mechanism depends on every
node performing heartbeat by registering itself with the discovery
module (via KV-Store Put operation). And for every Put operation,
the discovery module in all other nodes will receive a Watch
notification. That keeps the node alive.
Any node that fails to register itself within the TTL timer is
considered dead and removed from the discovery database.

The default timer (heartbeat = 20 seconds & ttl = 60 seconds)
works fine for small clusters.  But for large clusters, these
default timers are extremely aggressive and that causes high CPU
& most of the processing is spent managing the node discovery
and that impacts normal daemon operation.

Hence we need a way to make the discovery ttl and heartbeat
configurable.  As the cluster size grows, the user can change
these timers to make sure the daemon scales.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2efdb8cbf519f55836b0703e47c907e24a20eff6
Component: engine
2015-11-25 06:51:55 -08:00
109d171010 Moving prerquisite from #17231
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 20f1a7b496fad1556ccc61f35d58533f885e0ab2
Component: engine
2015-11-25 06:51:23 -08:00
f919763365 Merge pull request #17231 from zelahi/9745-addapparmor-note
Adding note about apparmor install on Ubuntu
Upstream-commit: 1c3e4c5b9f53917998d94afb3e53bdbea16472c4
Component: engine
2015-11-25 06:45:42 -08:00
eb58bc2fc0 Merge pull request #18227 from thaJeztah/fix-api-changes
docs: move API changes to the correct API version
Upstream-commit: 9cbfa7b00bd3b542632b40c5726316923d90cd18
Component: engine
2015-11-25 08:20:13 -05:00
7da657059d docs: move API changes to the correct API version
These changes were made as part of https://github.com/docker/docker/pull/17478
but inadvertently added to the v1.21 API version.

Also added a short description to the API changelog.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a06d5273b3cb72f68fc32da26955842287314970
Component: engine
2015-11-25 14:10:18 +01:00
26c51ea4a2 docs: fixups for plugin drivers in docker info
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300

but not added to the example output in the online
docs.

Also fixed mixed tabs/spaces in the API documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0a7e45e95c9e554c73581def80881534800a2b28
Component: engine
2015-11-25 13:54:54 +01:00
7073afc49a Fix markup for markdown table
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.

Changed the table to a plain HTML table as a workaround.

Also fixed indentation levels of two code examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bfdd94b0a8f0641f7bced9d3089a78e9550a7b04
Component: engine
2015-11-25 12:38:15 +01:00
51a4df16fb Fixing the volume options doc
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 41a36529a71d96a9ed9d334a6efa72b4616c2abd
Component: engine
2015-11-25 03:56:55 -06:00
b2c10cb07a 1. Adding note about apparmor install on Ubuntu
2. modified page to remove note for apparmor and added it as a requirement for installing it on ubuntu
3. moved note to under prerequisites section

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 0480da4d8cbd330732f005ea7ec1be93cc00e617
Component: engine
2015-11-24 22:53:14 -08:00
18fcb12c86 install.sh: fix for multiarch deb/ubuntu
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.

Fix this by qualifying the repo line with the currently active
architecture.

This fixes issue #18207.

Signed-off-by: Martin Kelly <martin@surround.io>
Upstream-commit: 3e5ac742417dc9461dd090c29ee9971ff0974adb
Component: engine
2015-11-24 16:53:13 -08:00
3f9a89737d Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: ad179e0e957a58181d71838eb0c2c7c019b4b2fb
Component: engine
2015-11-24 10:39:02 -05:00
d1c20a52eb Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 4d66f18be07b13cf41c48190d813fc045bb46678
Component: engine
2015-11-24 15:14:32 +08:00
0ec3e50e8d update 'top' api endpoint documentation
- update example based on '-ef' behavior
 - new example specifying ps args 'aux'
 - resolves #7205

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: e28e4c7840455e97ac277a121a429f99a0c079df
Component: engine
2015-11-23 15:41:34 -08:00
29c73dc71d Merge pull request #18167 from duglin/FixTagHelp
Add more to tag's -f flag's help
Upstream-commit: 097bc4881f37d4154c88874ee16fbaf1e346a193
Component: engine
2015-11-23 11:59:22 -05:00
ffce8a5c20 Merge pull request #18132 from WeiZhang555/api-changelog
Add API change to docs
Upstream-commit: 2bc792e3bb0f444ce25f112f604149da26a217b4
Component: engine
2015-11-23 11:57:46 -05:00
713c4dbaf0 Add some docs about build-arg's impact on the cache
Closes #18017

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5bf4766fcaae80b80d53cce88987a8d3a9ac357e
Component: engine
2015-11-23 08:51:11 -08:00
8923491bd9 Add more to tag's -f flag's help
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a70079ea23e8a36f9b3b517f7e7e87b8e24f3526
Component: engine
2015-11-23 07:20:10 -08:00
a12e446a79 Add API change to docs
Add API change description to docs due to `docker network inspect`
returns different data structure.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: bfe711bed342202ed0918a309b2000bb158c4eb7
Component: engine
2015-11-23 22:42:55 +08:00
824d689a06 Merge pull request #18137 from vanpire110/master
Update understanding-docker.md again 
Upstream-commit: 1d1de645fd52dd2f886ca650b645c960f2cb219c
Component: engine
2015-11-23 09:31:13 +01:00
6e71f2c42e Merge pull request #17489 from WeiZhang555/network-rm-multi
Enhance `docker network rm` to delete multi net
Upstream-commit: a600bf4eab48a19ea9d1919f95f612cdb229c893
Component: engine
2015-11-23 08:25:33 +01:00