Commit Graph
33088 Commits
Author SHA1 Message Date
Vincent Demeester b43802545b Merge pull request #24565 from thaJeztah/fix-node-inspect-formatting
docs: fix output of node inspect
Upstream-commit: 1dbe3f6e89e68e9f5cc8839dacc4f10281db1ead
Component: engine
2016-07-13 18:57:05 +02:00
Sebastiaan van Stijn 86fb23db37 Remove dead code for "inspect --pretty"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4d87f9083bfb3147566997b3f48c4805229f7c94
Component: engine
2016-07-13 18:56:02 +02:00
Sebastiaan van Stijn bb985637e2 Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7bf0faf42377a91a8535b443201d9ad62326889b
Component: engine
2016-07-13 18:47:29 +02:00
Daniel Nephin 04bb13f6d7 Merge service command and args as a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 674d227445887ea2f9a0fde6ebb7838bcce58578
Component: engine
2016-07-13 12:31:16 -04:00
Daniel Nephin e8f40d4fed Vendor go-shlex.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3464589c2aceb60972cdee14f57e0f41bcc8e327
Component: engine
2016-07-13 12:20:50 -04:00
Arnaud Porterie f08872faee Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
Sebastiaan van Stijn c1870c571b Don't set ulimits (nproc)
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if rlimits are
set on the main Docker daemon process (because the limits
propogate to all children).

We recommend using cgroups to do container-local accounting.

This applies the change added in 8db61095a3d0bcb0733580734ba5d54bc27a614d
to other init scripts.

Note that nfile cannot be set to unlimited, and the limit
is hardcoded to 1048576 (2^20) , see:
http://stackoverflow.com/a/1213069/1811501

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 428d7337e808ec5f4dba1b0aceda002f295cc320
Component: engine
2016-07-13 17:15:19 +02:00
Vincent Demeester 1348489290 Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
Vincent Demeester 43a676799e Merge pull request #24573 from aboch/chkf
Vendoring libnetwork 905d374 and other fix
Upstream-commit: ee981bcc73f3089627e734f983c6685dc5040b1b
Component: engine
2016-07-13 16:15:59 +02:00
Justin Cormack 87b7341bb5 Expand the documentation of "no-new-privileges"
The change to runc in https://github.com/opencontainers/runc/pull/789
was not documented previously. Also say what this affects and clean
up layout of initial table as there was some miscolouration of the
continuation lines.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3050d9af9b2384baed599be9d7142b4775f89e10
Component: engine
2016-07-13 14:41:58 +01:00
Vincent Demeester 891b2576ba Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Upstream-commit: 92b15778712ff2eb85bf5b7e00fb4fe4310fd6b1
Component: engine
2016-07-13 15:13:58 +02:00
Yong Tang 5ecd44d3c7 Extend deprecation cycle to 3 releases by default
At the moment docker's deprecation policy is 2 release cycles by
default, which is around 5 months. This may not be enough for
production environment and there is a need to extend the
deprecation cycle to 3 releases (see #24494).

This fix updates the docs/deprecated.md and extend the deprecation
cycle to 3 releases.

This fix is related to #24494 and #24534.

This fix fixes #24534.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9414955c608834c20e3764e753854e667f2e0cbe
Component: engine
2016-07-13 06:02:12 -07:00
Vladimir Pouzanov 866d35843d Added optional flags to init gcp logger metadata
Signed-off-by: Vladimir Pouzanov <farcaller@google.com>
Upstream-commit: 71f299976447a641bacf029a3866fb4bc12a7686
Component: engine
2016-07-13 13:56:18 +01:00
Sebastiaan van Stijn 345782c0fa Merge pull request #24583 from albers/completion-run--network
Change bash completion for `docker run --net*` to `--network*`
Upstream-commit: a9a8d807f09014162d63503a5d36a42f6d64b796
Component: engine
2016-07-13 12:46:58 +02:00
Harald Albers 0a5f2230dd Change bash completion for docker run --net* to --network*
Ref: https://github.com/docker/docker/pull/23324

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c4846f697271d2990cca8481338f4827b2558112
Component: engine
2016-07-13 12:42:33 +02:00
Sebastiaan van Stijn 3c899b8740 Merge pull request #24301 from coolljt0725/add_dummy_to_check_config
Add IPVLAN and DUMMY to check-config.sh
Upstream-commit: 5d11a7987b2987921e436d88dd57ead07a64b030
Component: engine
2016-07-13 12:38:27 +02:00
Antonio Murdaca f93512b7e1 Dockerfile: update osx cross toolchain
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8159b5ca98eaeabe4e3f3038418a47a3c49c114d
Component: engine
2016-07-13 12:22:58 +02:00
Antonio Murdaca 6e8f820ea2 Merge pull request #24581 from albers/completion-service--endpoint-mode
Update bash completion for `docker service {create,update} {--mode,--…
Upstream-commit: ae1a809c39c72d50554740e42bb1a4af3a9dbfb1
Component: engine
2016-07-13 09:52:52 +00:00
Vincent Demeester f8b296020e Merge pull request #24579 from albers/completion-service--registry-auth
bash completion for `docker service {create,update} --registry-auth`
Upstream-commit: a63efabd5344f4faf7c65ee525059a1e24328e50
Component: engine
2016-07-13 11:38:45 +02:00
Harald Albers 70db2efccc Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a394490d3895fe0122b44a3f89acc04946b83bda
Component: engine
2016-07-13 11:37:31 +02:00
Harald Albers 97f6147543 bash completion for docker service {create,update} --registry-auth
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a44e71c4274cd311e99722277cb674b2bc84d86e
Component: engine
2016-07-13 11:20:02 +02:00
Sebastiaan van Stijn 3af50e048c Merge pull request #24560 from thaJeztah/remove-execution-driver
docs: remove executiondriver from API 1.24 docs
Upstream-commit: 9d236d88b78b02ff11f76043522525a9d35e6372
Component: engine
2016-07-13 10:43:13 +02:00
Alessandro Boch 5bac2725f4 Handle ingress sbox creation gracefully
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ed6641ad61d6d4f6475062ab2a2669a379caf574
Component: engine
2016-07-12 21:51:44 -07:00
Alessandro Boch 04f3b7aca4 Vendoring libnetwork 905d374
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: cabc5b27c0d93a7665a24d205572a9462bb85da6
Component: engine
2016-07-12 21:51:11 -07:00
Tibor Vass 70c6954131 Merge pull request #24570 from tiborvass/buildid-docker-proxy
docker-proxy: Force external linking to add BuildID information to pl…
Upstream-commit: f9383c652cecf559756ec06564bd1b057ad92f33
Component: engine
2016-07-12 20:23:30 -07:00
Tibor Vass f883bd35d2 docker-proxy: Force external linking to add BuildID information to please rpm
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9a690d3544563bf3b88708dabd5bc853e0e749d2
Component: engine
2016-07-12 19:59:48 -07:00
Sebastiaan van Stijn 7d87c527de Merge pull request #24566 from meichuntao/master
fix the docker run --readonly example. rename '/icanwrite here' to '/…
Upstream-commit: 489adc96b84ed55bfef0abcb654991620be5510f
Component: engine
2016-07-13 02:49:52 +02:00
Brian Goff 9166d8ca38 Merge pull request #24556 from thaJeztah/tabz-tabz-tabz
use tabs for indentation
Upstream-commit: dd05a2c0be929b634a00cb50f10f94c59f0190bd
Component: engine
2016-07-12 20:47:28 -04:00
Derek McGowan c18a0faf47 Vendor distribution changes
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 1e0b7538fa2aba4aa252e423362171f1bbfa166c
Component: engine
2016-07-12 17:36:57 -07:00
Mei ChunTao f16f188274 fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
Upstream-commit: acbe38a3ccb85be012d88f3109b688f8b815daaf
Component: engine
2016-07-13 08:21:26 +08:00
Sebastiaan van Stijn 629585dfca docs: fix output of node inspect
The output uses tabs, but those don't
translate well to the rendered output in
the docs, so replacing the tabs with spaces.

Also updates the output, because REPLICATED,
and SPREAD are no longer all-caps in the
actual output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 477a5f8fb0be1244858614cdda2d2528208fc88a
Component: engine
2016-07-13 01:53:51 +02:00
Sebastiaan van Stijn 937633217f Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ea365e4cb37d037046364773d01a744b1258ce4e
Component: engine
2016-07-13 01:08:54 +02:00
Tibor Vass d3149bd51e Merge pull request #24558 from clnperez/systemd-hack-redo
Uncomment the TasksMax val later in the deb build
Upstream-commit: 8a405461b0efc16d712770ea9ce48dff4703a7d0
Component: engine
2016-07-12 16:06:44 -07:00
Michael Crosby 53c33cc1be Add --oom-score-adjust to daemon
This adds an `--oom-score-adjust` flag to the daemon so that the value
provided can be set for the docker daemon's process.  The default value
for the flag is -500.  This will allow the docker daemon to have a
less chance of being killed before containers do.  The default value for
processes is 0 with a min/max of -1000/1000.

-500 is a good middle ground because it is less than the default for
most processes and still not -1000 which basically means never kill this
process in an OOM condition on the host machine.  The only processes on
my machine that have a score less than -500 are dbus at -900 and sshd
and xfce( my window manager ) at -1000.  I don't think docker should be
set lower, by default, than dbus or sshd so that is why I chose -500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a894aec8d81de5484152a76d76b80809df9edd71
Component: engine
2016-07-12 15:53:15 -07:00
Sebastiaan van Stijn b912567a85 docs: remove executiondriver from API 1.24 docs
the executiondriver property was removed in
880484992c360881dc57a3317b84d75300c358af, but docs
were only updated for the 1.25 API, not for 1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3c6ef4c29d28e92ea29816d6117412162d829c60
Component: engine
2016-07-13 00:49:29 +02:00
Tibor Vass 231ed0ed4e Merge pull request #23324 from icecrime/add_run_network
Add run network
Upstream-commit: 778b38cbf1f03d54ef86ba79882af45d653e71b0
Component: engine
2016-07-12 14:59:48 -07:00
Vincent Demeester cbbd824f10 Merge pull request #24548 from cpuguy83/24167_fix_log_config_merge
Fix panic while merging log configs to nil map
Upstream-commit: 7a1442baf6e31b3c94a2e9fd92155a75c1987868
Component: engine
2016-07-12 23:40:47 +02:00
Christy Perez bc85e9b069 Uncomment the TasksMax val later in the deb build
The original sed placement was creating packages with an
"unsupported" tag in the package name.

Fixes #24197

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: dab287819a21ef8755d2f1b578ebeea33eb4e784
Component: engine
2016-07-12 16:30:31 -05:00
Sebastiaan van Stijn b9f07879e0 use tabs for indentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fa077f74969b2c11f1ccfb4c5777c98b5e123013
Component: engine
2016-07-12 23:16:55 +02:00
Vincent Demeester 83f818387f Merge pull request #24549 from cpuguy83/fix_nil_meminfo
Fix panic when meminfo couldn't be read
Upstream-commit: 534c3e328fa14cee9b012b18faa35fd1571703ef
Component: engine
2016-07-12 23:05:27 +02:00
Brian Goff 3abfcc9b91 Merge pull request #24546 from mavenugo/stend
Fixing a stale endpoint issue that blocks ingress network cleanup 
Upstream-commit: 933584f16fbd8fa1ffef691ed8d1673e7c896781
Component: engine
2016-07-12 16:40:19 -04:00
Sebastiaan van Stijn 6e41fcca17 Merge pull request #24550 from thaJeztah/fix-evil-links
Fix some broken sourceforge.net links
Upstream-commit: e794fe2750545be6aee237b189e50a0e66c3d81e
Component: engine
2016-07-12 22:25:19 +02:00
Sebastiaan van Stijn 1a5d7b10d7 Merge pull request #24552 from thaJeztah/add-none-join-mode
Add "auto-accept=none" to documentation
Upstream-commit: d0b495f6b12fb02fd0742252d4ff90d7b02e523d
Component: engine
2016-07-12 22:21:23 +02:00
Tõnis Tiigi f0e9eeb33f Merge pull request #24465 from LK4D4/restart_cluster_test
integration-cli: add test for restarting entire swarm cluster
Upstream-commit: 08a2fd7e2e95c235225e796b8b6d4c89478394ea
Component: engine
2016-07-12 13:12:33 -07:00
Sebastiaan van Stijn be4ee8451b Add "auto-accept=none" to documentation
The "none" option was not added to the documentation.
This adds an example, and adds additional information
on manually accepting or rejecting a node.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 06517753c19262129202b224a35965a2686e49e9
Component: engine
2016-07-12 22:06:01 +02:00
Charles Smith 3b51db3f13 Merge pull request #24544 from sfsmithcha/network_plugins_swarm_mode
author merge: add caveat for network plugins in swarm mode
Upstream-commit: cbdce5800896a15b3a19c0178a7e367ac7072af5
Component: engine
2016-07-12 13:05:05 -07:00
Arnaud Porterie (icecrime) a4c4731dc9 Rename --net to --network
Add a `--network` flag which replaces `--net` without deprecating it
yet. The `--net` flag remains hidden and supported.

Add a `--network-alias` flag which replaces `--net-alias` without deprecating
it yet. The `--net-alias` flag remains hidden and supported.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: c0c7d5e71586ec8e4d54aef9e061f061e9223cc4
Component: engine
2016-07-12 13:01:35 -07:00
Sebastiaan van Stijn 2fa3ccc004 Fix some broken sourceforge.net links
Looks like there's issues with sourceforge project
pages. Given that sourceforge isn't really what
it used to be, trying to find alternative URLs
where possible.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0e7a1079be5e87aae2abcda7c27a2b0e67270a50
Component: engine
2016-07-12 21:51:14 +02:00
Brian Goff b8f5ee5430 Fix panic when meminfo couldn't be read
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6
Component: engine
2016-07-12 15:30:21 -04:00
Brian Goff f1f9d4454d Fix panic while merging log configs to nil map
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7dff31064824ed1f9b046fe5c29bd707e663ee0b
Component: engine
2016-07-12 15:24:42 -04:00