beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25931 commits 14 branches 412 tags 338 MiB
Commit graph

25931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
7925de9098 Merge pull request #24598 from albers/completion-daemon--oom-score-adjust 
bash completion for `docker daemon --oom-score-adjust`
 2016-07-13 23:34:54 +02:00
Derek McGowan
19d48f0b8b Allow v1 search to use v2 auth with identity token 
Updates the v1 search endpoint to also support v2 auth when an identity token is given.
Only search v1 endpoint is supported since there is not v2 search currently defined to replace it.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2016-07-13 13:30:24 -07:00
Daniel Nephin
3249c1d0e7 Fix multi-remove during service update. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:11:08 -04:00
Daniel Nephin
4c6faa4340 Change the add/update flags to include 'add' 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:06:25 -04:00
Daniel Nephin
ead1f62aba PR feedback 
improve help text for service update remove flags
implement proper merge update of placement flag
more code re-use in update functions using a toRemove set.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:06:25 -04:00
Daniel Nephin
dc33fc1ff4 Add remove flags for service update 
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:06:25 -04:00
Vincent Demeester
698bd5ab65
Small zsh completion fix on --pretty & --no-resolve 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-13 22:03:11 +02:00
Tibor Vass
fd8269b8f6 Merge pull request #24195 from dnephin/service-update-better-args-and-command 
Update service `args` with a single flag (shlex)
 2016-07-13 13:02:19 -07:00
Tibor Vass
1f74917f60 Merge pull request #24591 from thaJeztah/remove-shorthand-flagz 
Remove shorthand flags for "mount", "pretty", and "no-resolve"
 2016-07-13 12:51:53 -07:00
Harald Albers
e1e310ea1f bash completion for docker daemon --oom-score-adjust 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-13 12:31:55 -07:00
Arnaud Porterie
ef322a3fbb Merge pull request #24516 from crosbymichael/oom-score 
Add --oom-score-adjust to daemon
 2016-07-13 18:39:30 +00:00
Kenfe-Mickael Laventure
8e9fbc8f5f Fix data race in libcontainerd 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-13 10:04:42 -07:00
Vincent Demeester
1dbe3f6e89 Merge pull request #24565 from thaJeztah/fix-node-inspect-formatting 
docs: fix output of node inspect
 2016-07-13 18:57:05 +02:00
Sebastiaan van Stijn
4d87f9083b
Remove dead code for "inspect --pretty" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-13 18:56:02 +02:00
Sebastiaan van Stijn
7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-13 18:47:29 +02:00
Daniel Nephin
674d227445 Merge service command and args as a string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 12:31:16 -04:00
Daniel Nephin
3464589c2a Vendor go-shlex. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 12:20:50 -04:00
Arnaud Porterie
58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update 
Remove --command flag for service update
 2016-07-13 16:01:11 +00:00
Vincent Demeester
e4a024d590
Remove --command flag for service update 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-13 16:19:21 +02:00
Vincent Demeester
ee981bcc73 Merge pull request #24573 from aboch/chkf 
Vendoring libnetwork 905d374 and other fix
 2016-07-13 16:15:59 +02:00
Justin Cormack
3050d9af9b 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>
 2016-07-13 14:41:58 +01:00
Vincent Demeester
92b1577871 Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency 
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
 2016-07-13 15:13:58 +02:00
Yong Tang
9414955c60 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>
 2016-07-13 06:02:12 -07:00
Sebastiaan van Stijn
a9a8d807f0 Merge pull request #24583 from albers/completion-run--network 
Change bash completion for `docker run --net*` to `--network*`
 2016-07-13 12:46:58 +02:00
Harald Albers
c4846f6972 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>
 2016-07-13 12:42:33 +02:00
Sebastiaan van Stijn
5d11a7987b Merge pull request #24301 from coolljt0725/add_dummy_to_check_config 
Add IPVLAN and DUMMY to check-config.sh
 2016-07-13 12:38:27 +02:00
Antonio Murdaca
ae1a809c39 Merge pull request #24581 from albers/completion-service--endpoint-mode 
Update bash completion for `docker service {create,update} {--mode,--…
 2016-07-13 09:52:52 +00:00
Vincent Demeester
a63efabd53 Merge pull request #24579 from albers/completion-service--registry-auth 
bash completion for `docker service {create,update} --registry-auth`
 2016-07-13 11:38:45 +02:00
Harald Albers
a394490d38 Update bash completion for docker service {create,update} {--mode,--endpoint-mode} 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-13 11:37:31 +02:00
Harald Albers
a44e71c427 bash completion for docker service {create,update} --registry-auth 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-13 11:20:02 +02:00
Sebastiaan van Stijn
9d236d88b7 Merge pull request #24560 from thaJeztah/remove-execution-driver 
docs: remove executiondriver from API 1.24 docs
 2016-07-13 10:43:13 +02:00
Alessandro Boch
ed6641ad61 Handle ingress sbox creation gracefully 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-12 21:51:44 -07:00
Alessandro Boch
cabc5b27c0 Vendoring libnetwork 905d374 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-12 21:51:11 -07:00
Tibor Vass
f9383c652c Merge pull request #24570 from tiborvass/buildid-docker-proxy 
docker-proxy: Force external linking to add BuildID information to pl…
 2016-07-12 20:23:30 -07:00
Tibor Vass
9a690d3544 docker-proxy: Force external linking to add BuildID information to please rpm 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-12 19:59:48 -07:00
Sebastiaan van Stijn
489adc96b8 Merge pull request #24566 from meichuntao/master 
fix the docker run --readonly example. rename '/icanwrite here' to '/…
 2016-07-13 02:49:52 +02:00
Brian Goff
dd05a2c0be Merge pull request #24556 from thaJeztah/tabz-tabz-tabz 
use tabs for indentation
 2016-07-12 20:47:28 -04:00
Derek McGowan
1e0b7538fa Vendor distribution changes 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-07-12 17:36:57 -07:00
Mei ChunTao
acbe38a3cc fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here' 
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
 2016-07-13 08:21:26 +08:00
Sebastiaan van Stijn
477a5f8fb0
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>
 2016-07-13 01:53:51 +02:00
Sebastiaan van Stijn
ea365e4cb3
Make labels human readable 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-13 01:08:54 +02:00
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