toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,727 Commits 3 Branches 295 Tags
f883751993225839d446d8490a30094a13da8c80
Commit Graph
25727 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester f883751993 Merge pull request #23773 from dnephin/allow-remove-during-update 
Add remove flags for service update
Upstream-commit: 83f232e18670af884d84d10690e0c11c0e2f22b8
Component: engine
 2016-07-14 11:10:30 +02:00
Sebastiaan van Stijn 87ddd8fdff Merge pull request #24615 from aaronlehmann/spaces-not-tabs 
Use spaces, not tabs, to format sample "swarm join" command
Upstream-commit: ffd03708e954ef89eb48c2cd541897e07138b961
Component: engine
 2016-07-14 11:07:12 +02:00
Vincent Demeester 8ffcc6cb3b Merge pull request #24607 from dongluochen/serviceInspect 
Fix service inspect --pretty
Upstream-commit: accbed33f4b721a5033e3319d132d6e3cd396b68
Component: engine
 2016-07-14 10:51:04 +02:00
Dong Chen 3f6cccd448 Fix service inspect --pretty. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 08ae4e544d5744e975da0f89c4f04baa2b8474f2
Component: engine
 2016-07-14 00:11:29 -07:00
Aaron Lehmann b84397788e 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>
Upstream-commit: 6de8fcb2f2baf335fc24e10909078199af528e8d
Component: engine
 2016-07-13 19:31:05 -06:00
Tibor Vass 93beda0406 Merge pull request #24592 from thaJeztah/remove-dead-code 
Remove dead code for "inspect --pretty"
Upstream-commit: 1c6a8715ab31103f9cde977fa68d2f14b4871adb
Component: engine
 2016-07-13 14:46:42 -07:00
Sebastiaan van Stijn 1382e56d1b Merge pull request #24598 from albers/completion-daemon--oom-score-adjust 
bash completion for `docker daemon --oom-score-adjust`
Upstream-commit: 7925de9098e6ce5d7e5c2a8a19926f1f90105090
Component: engine
 2016-07-13 23:34:54 +02:00
Daniel Nephin e25d6b5a15 Fix multi-remove during service update. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3249c1d0e79f57642b96f6692ffa44f46f15b602
Component: engine
 2016-07-13 16:11:08 -04:00
Daniel Nephin 8f0edf84fe Change the add/update flags to include 'add' 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4c6faa434071b87a55256e86020cb78495e9951d
Component: engine
 2016-07-13 16:06:25 -04:00
Daniel Nephin b4c7aa8c2f 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>
Upstream-commit: ead1f62abae5e5ad188536a01fb88d55339e3f63
Component: engine
 2016-07-13 16:06:25 -04:00
Daniel Nephin 61271c6fdb Add remove flags for service update 
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dc33fc1ff433fcc70efc22f5cea9b87c6ec64a3b
Component: engine
 2016-07-13 16:06:25 -04:00
Tibor Vass 5ae05f5a48 Merge pull request #24195 from dnephin/service-update-better-args-and-command 
Update service `args` with a single flag (shlex)
Upstream-commit: fd8269b8f65b6b111e234d390e6f2226b85dbc6d
Component: engine
 2016-07-13 13:02:19 -07:00
Tibor Vass f731a7777f Merge pull request #24591 from thaJeztah/remove-shorthand-flagz 
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Upstream-commit: 1f74917f60edf8d7051a0c19481e7133e1b4537d
Component: engine
 2016-07-13 12:51:53 -07:00
Harald Albers 4c71a2a9b6 bash completion for docker daemon --oom-score-adjust 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e1e310ea1fc47488a7404e3fa52fa606fe270ed0
Component: engine
 2016-07-13 12:31:55 -07:00
Arnaud Porterie df6d3b4289 Merge pull request #24516 from crosbymichael/oom-score 
Add --oom-score-adjust to daemon
Upstream-commit: ef322a3fbb31c2299e414f1c314f245c527ac3ea
Component: engine
 2016-07-13 18:39:30 +00:00
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
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
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
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 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
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