Commit Graph

215 Commits

Author SHA1 Message Date
13df21d3ec Merge pull request #18325 from RsrchBoy/topic/newtorks
newtork -> network (minor spelling correction)
Upstream-commit: e3fbd6922fe549755890a205a0b8dd88022d5924
Component: engine
2015-12-04 14:03:55 +01:00
9e539c7be0 Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
Add support for blkio read/write bps device
Upstream-commit: cb6a1a6042fc30e0beeaa79a2f8def4b53019483
Component: engine
2015-12-04 12:29:58 +01:00
d5560ff674 docs: fix weight-deivce option args
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: cc0e407e1778b79a3c75fd68f7c7e48e5449f99b
Component: engine
2015-12-04 09:28:35 +08:00
7be0f9667b Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
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
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
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
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
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
d0c344304f newtork -> network (minor spelling correction)
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
Upstream-commit: 8fd2630d01d65dd64053091ef9b35a98f4fc3d5c
Component: engine
2015-12-01 15:26:36 -06: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
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
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
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
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
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
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
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
3a475c3707 Enhance docker network rm to delete multi net
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: e7eb6687ef7da34cd69b27cfbaf3fd8112073530
Component: engine
2015-11-22 05:37:00 +08:00
9f0c131692 Merge pull request #16613 from WeiZhang555/docker-cp-symlink
Add option `-L` to allow `docker cp` follow symbol link
Upstream-commit: 3ff9bb53326312a66fee19bc56dd2ad9c642b133
Component: engine
2015-11-21 17:03:24 +01:00
b97ed2a561 Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
modifying docker --since and --until to support nanoseconds and time …
Upstream-commit: 6653f827965b431139af141fa2cc68a6513abe71
Component: engine
2015-11-20 23:37:44 +01:00
9479751884 Merge pull request #17718 from wenchma/17716_before_filter_doc
Re-implement --before and --since as options for --filter
Upstream-commit: 8fa09749fb7b5560ffc7f0a73005302f99d89d01
Component: engine
2015-11-20 11:24:19 -08:00
6d12941a33 Merge pull request #16168 from NIWAHideyuki/16164-shm-size
Addition of "--shm-size" to which size of /dev/shm is changed
Upstream-commit: a76bdea21ba204b1cdc6648a182ae82355350a5f
Component: engine
2015-11-20 10:01:48 -08:00
27af07df7b Add '-L' option for cp
Fixes #16555

Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 92600bdec1284f9031868751f61bef476d2e1dbd
Component: engine
2015-11-21 00:36:56 +08:00
9380772bfb Re-implement --before and --since as options for --filter
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 1921c629381d25ebff7b8b8c8348a0a81525f264
Component: engine
2015-11-20 13:10:13 +08:00
7c1d3da9d9 Small changes to storage driver/commands ref
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082
Component: engine
2015-11-19 17:13:23 -08:00
4581692a0e Addition of "--shm-size" to which size of /dev/shm is changed.
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
Upstream-commit: 5aeaf2a0c4236711e0981515d8627b30e22a1637
Component: engine
2015-11-20 09:24:18 +09:00
12f51add56 Merge pull request #17704 from LK4D4/default_cgroupfs
Use fs cgroups by default
Upstream-commit: c32f8bb36a5f1b2fe0586a1e080c14d8a6b68610
Component: engine
2015-11-19 14:01:13 +01:00
92c9b9e9d4 Use fs cgroups by default
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 419fd7449fe1a984f582731fcd4d9455000846b0
Component: engine
2015-11-18 16:16:13 -08:00
92d26f8f83 Fix a small typo in volume_inspect.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a96be2930a64be88a5e8bf0e3b0283c657f73844
Component: engine
2015-11-18 16:02:24 +01:00
c4d89a3f60 Merge pull request #17478 from vdemeester/pr-13921
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
2015-11-17 15:44:57 -08:00
35adb0ee96 fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 82ba25bea9ae8412186e4cd1d3ba30e6a2072a26
Component: engine
2015-11-15 23:32:40 +08:00
964f8b63bd Add pkg/parsers/architecture and pkg/platform
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
2015-11-14 23:03:02 +01:00
3e0bec1370 /info: Add keys Architecture, OSType
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
Upstream-commit: 4e8fcd40028ed09b139b6f86954e676a1839be9c
Component: engine
2015-11-14 22:21:45 +01:00
2f6a89e161 modifying docker --since and --until to support nanoseconds and time zones
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: 430d8ff6113e41edc4605267081fa424a9bfe19f
Component: engine
2015-11-13 09:56:15 -06:00
c0d8796b26 Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00