Commit graph

25736 commits

Author SHA1 Message Date
Tibor Vass
8a405461b0 Merge pull request #24558 from clnperez/systemd-hack-redo
Uncomment the TasksMax val later in the deb build
2016-07-12 16:06:44 -07:00
Michael Crosby
a894aec8d8 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>
2016-07-12 15:53:15 -07:00
Sebastiaan van Stijn
3c6ef4c29d
docs: remove executiondriver from API 1.24 docs
the executiondriver property was removed in
880484992c, but docs
were only updated for the 1.25 API, not for 1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 00:49:29 +02:00
Tibor Vass
778b38cbf1 Merge pull request #23324 from icecrime/add_run_network
Add run network
2016-07-12 14:59:48 -07:00
Vincent Demeester
7a1442baf6 Merge pull request #24548 from cpuguy83/24167_fix_log_config_merge
Fix panic while merging log configs to nil map
2016-07-12 23:40:47 +02:00
Christy Perez
dab287819a 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>
2016-07-12 16:30:31 -05:00
Sebastiaan van Stijn
fa077f7496
use tabs for indentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 23:16:55 +02:00
Vincent Demeester
534c3e328f Merge pull request #24549 from cpuguy83/fix_nil_meminfo
Fix panic when meminfo couldn't be read
2016-07-12 23:05:27 +02:00
Brian Goff
933584f16f Merge pull request #24546 from mavenugo/stend
Fixing a stale endpoint issue that blocks ingress network cleanup
2016-07-12 16:40:19 -04:00
Sebastiaan van Stijn
e794fe2750 Merge pull request #24550 from thaJeztah/fix-evil-links
Fix some broken sourceforge.net links
2016-07-12 22:25:19 +02:00
Sebastiaan van Stijn
d0b495f6b1 Merge pull request #24552 from thaJeztah/add-none-join-mode
Add "auto-accept=none" to documentation
2016-07-12 22:21:23 +02:00
Tõnis Tiigi
08a2fd7e2e Merge pull request #24465 from LK4D4/restart_cluster_test
integration-cli: add test for restarting entire swarm cluster
2016-07-12 13:12:33 -07:00
Sebastiaan van Stijn
06517753c1
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>
2016-07-12 22:06:01 +02:00
Charles Smith
cbdce58008 Merge pull request #24544 from sfsmithcha/network_plugins_swarm_mode
author merge: add caveat for network plugins in swarm mode
2016-07-12 13:05:05 -07:00
Arnaud Porterie (icecrime)
c0c7d5e715
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>
2016-07-12 13:01:35 -07:00
Sebastiaan van Stijn
0e7a1079be
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>
2016-07-12 21:51:14 +02:00
Brian Goff
5f7b1b604c Fix panic when meminfo couldn't be read
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-12 15:30:21 -04:00
Brian Goff
7dff310648 Fix panic while merging log configs to nil map
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-12 15:24:42 -04:00
Charles Smith
9ae64de614 add caveat for network plugins in swarm mode
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-12 11:50:34 -07:00
Arnaud Porterie (icecrime)
5b21c8a408
Organize run flags into categories
Flatten the list of `docker run` flags and group them loosely by
category (general purpose, security, networking, ...).

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-07-12 11:35:41 -07:00
Arnaud Porterie
79432b4367 Merge pull request #24528 from rsippl/24526-empty-services-list
Return an empty services list if no services are running
2016-07-12 18:31:28 +00:00
Madhu Venugopal
a4926a4d92 Fixing a stale endpoint issue that blocks ingress network cleanup
fixes #24400

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-12 11:27:58 -07:00
Madhu Venugopal
92c40f9bc0 Vendoring libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-12 11:27:32 -07:00
Sebastiaan van Stijn
a44f010702 Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
Allow option to override kernel check in overlay2
2016-07-12 19:22:27 +02:00
Ralf Sippl
65e72133a1 Add API test for empty services list
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com>
2016-07-12 17:31:44 +02:00
Phil Estes
10d5d08c48 Merge pull request #24520 from aaronlehmann/no-retry-on-unknown-repository
Don't retry push on an unknown repository
2016-07-12 11:17:29 -04:00
Sebastiaan van Stijn
7da11b1afd Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
Add comma-separated --auto-accept support.
2016-07-12 16:29:21 +02:00
Doug Davis
71d404e2bc Merge pull request #24532 from yongtang/07122016-typo-docs
Fix a minor typo in swarm tutorial docs
2016-07-12 08:03:53 -04:00
Yong Tang
93fa7e7555 Fix a minor typo in swarm tutorial docs
This fix fixes a minor typo in swarm tutorial's delete service docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-12 05:00:39 -07:00
Sebastiaan van Stijn
110b2aecda Merge pull request #24504 from hqhq/soften_update_kmem
Soften limitation of update kernel memory
2016-07-12 13:58:17 +02:00
Sebastiaan van Stijn
c7b283bbe3 Merge pull request #24519 from thaJeztah/add-pidmode-api-docs
Add missing API docs for HostConfig.PidMode
2016-07-12 12:31:58 +02:00
Sebastiaan van Stijn
024b467ebe Merge pull request #24522 from hairyhenderson/clarify-build-args-secret-warning
Clarify warning against using build-time variables for secrets
2016-07-12 12:13:37 +02:00
Ralf Sippl
c8e4e95db9 Return an empty services list if no services are running
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com>
2016-07-12 11:41:04 +02:00
Vincent Demeester
1685b605a8 Merge pull request #24464 from tonistiigi/waitandassert
Use waitAndAssert to test node state changes
2016-07-12 10:05:55 +02:00
Brian Goff
b91e2dd994 Merge pull request #24229 from anusha-ragunathan/shutdown-plugins
Shutdown plugins during daemon shutdown.
2016-07-11 22:14:50 -04:00
Dave Henderson
9af24ba3ac Clarify warning against using build-time variables for secrets
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2016-07-11 21:21:33 -04:00
Qiang Huang
08c7075c40 Soften limitation of update kernel memory
Kernel memory is not allowed to be updated if container is
running, it's not actually a precise kernel limitation.

Before kernel version 4.6, kernel memory will not be accounted
until kernel memory limit is set, if a container created with
kernel memory initialized, kernel memory is accounted as soon
as process created in container, so kernel memory limit update
is allowed afterward. If kernel memory is not initialized,
kernel memory consumed by processes in container will not be
accounted, so we can't update the limit because the account
will be wrong.

So update kernel memory of a running container with kernel memory
initialized is allowed, we should soften the limitation by docker.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-12 08:07:24 +08:00
Aaron Lehmann
a12ab28e0a Don't retry push on an unknown repository
If the remote registry responds with a NAME_UNKNOWN error, treat this as
a fatal error and don't retry the push.

Tested against an ECR registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-11 18:06:23 -06:00
Tibor Vass
880484992c Merge pull request #24501 from hqhq/remove_exec_driver
Remove execution driver
2016-07-11 16:54:36 -07:00
Sebastiaan van Stijn
2c9b5addc5
Add missing API docs for HostConfig.PidMode
The `--pid` flag was added in Docker 1.5.0, but the
API changes were not documented. In Docker 1.12.0,
`--pid=container:<name|id>` was added as an additional
option, but also undocumented.

This adds the missing API documentation for this
option.

Also see commits
47e3da848f (for 1.5.0), and
ebeb5a0422 (for 1.12.0).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 01:52:42 +02:00
Derek McGowan
ff98da0607 Allow option to override kernel check in overlay2
Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs.

Fixes #24023

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-11 16:48:08 -07:00
johnharris85
8e14882773 Add support for comma-separated --auto-accept syntax.
Signed-off-by: John Harris <john@johnharris.io>
2016-07-11 15:47:04 -07:00
Alexander Morozov
ae4137ae3c integration-cli: add test for restarting entire swarm cluster
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-07-11 14:48:57 -07:00
Sebastiaan van Stijn
6dc2dd4410 Merge pull request #23513 from mansinahar/update-content-trust-doc
Change content-trust doc to not point to images that don't exist #22730
2016-07-11 23:42:53 +02:00
Anusha Ragunathan
863ab9ab13 Shutdown plugins during daemon shutdown.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-11 14:21:27 -07:00
John Howard
b215c4c974 Merge pull request #24427 from swernli/remove_custom_images
Removing Custom Images support
2016-07-11 14:01:41 -07:00
Vincent Demeester
36f3d4af23 Merge pull request #24474 from mavenugo/fix-24452
swarmkit expects network-id for as target
2016-07-11 20:59:38 +02:00
Vincent Demeester
46649755f8 Merge pull request #24051 from allencloud/return-err-when-stack-name-nonexist
output some details when stack name does not exist
2016-07-11 20:43:09 +02:00
Sebastiaan van Stijn
c6d550be98 Merge pull request #24471 from joaofnfernandes/broken-link
Fixes broken link in docs.
2016-07-11 19:43:37 +02:00
Joao Fernandes
6c9b5da5a1 Fixes broken link in docs.
Fixes #24428

Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2016-07-11 10:20:01 -07:00