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

25736 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Murdaca
0a96ba8a0f Merge pull request #24593 from mlaventure/fix-libcontainerd-data-race 
Fix data race in libcontainerd
 2016-07-14 17:27:24 +02:00
Sebastiaan van Stijn
e056b4e370 Merge pull request #24630 from eskaaren/status_409 
Status code 409 received when conflicting name when creating container
 2016-07-14 15:26:21 +02:00
Eivin Giske Skaaren
5bf46cc436 Status code 409 received when conflicting name when creating container 
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
 2016-07-14 14:58:43 +02:00
Sebastiaan van Stijn
e7e9f753e8 Merge pull request #24628 from vdemeester/service-doc-fixes 
Service doc fixes
 2016-07-14 11:38:07 +02:00
Vincent Demeester
9c5782280c Merge pull request #24588 from justincormack/nonewprivsdoc 
Expand the documentation of "no-new-privileges"
 2016-07-14 11:34:33 +02:00
Vincent Demeester
cc651bc642
Update service inspect --pretty reference docs 
Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-14 11:23:03 +02:00
Vincent Demeester
dbe310eff0
Update service update commandline reference docs 
Update with the new remove flags

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-14 11:22:18 +02:00
Vincent Demeester
83f232e186 Merge pull request #23773 from dnephin/allow-remove-during-update 
Add remove flags for service update
 2016-07-14 11:10:30 +02:00
Sebastiaan van Stijn
ffd03708e9 Merge pull request #24615 from aaronlehmann/spaces-not-tabs 
Use spaces, not tabs, to format sample "swarm join" command
 2016-07-14 11:07:12 +02:00
Vincent Demeester
accbed33f4 Merge pull request #24607 from dongluochen/serviceInspect 
Fix service inspect --pretty
 2016-07-14 10:51:04 +02:00
Dong Chen
08ae4e544d Fix service inspect --pretty. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-07-14 00:11:29 -07:00
Aaron Lehmann
6de8fcb2f2 Use spaces, not tabs, to format sample "swarm join" command 
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-13 19:31:05 -06:00
Tibor Vass
1c6a8715ab Merge pull request #24592 from thaJeztah/remove-dead-code 
Remove dead code for "inspect --pretty"
 2016-07-13 14:46:42 -07:00
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
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
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
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
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