a7897f1409
State that docker supports fedora 24
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 6780bdcbad3ab3b3de1568e51db676bb0f059cd8
Component: engine
2016-07-14 16:24:21 -07:00
04ff70ab75
Enable docker socket and service on fedora
...
Make sure that the users enable both the socket and service for docker
as part of the default install instructions. If both are not enabled
docker will not start at boot and restart containers.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7a93a87c1a254abbf8e68093d4be241097694bb1
Component: engine
2016-07-14 16:23:05 -07:00
158079c51b
Merge pull request #24568 from dmcgowan/search-v2-auth
...
Allow v1 search to use v2 auth with identity token
Upstream-commit: 56fb100140f96a010dcc834ed1d1626ffbc28970
Component: engine
2016-07-14 19:11:33 +02:00
8de09a35ce
Merge pull request #24593 from mlaventure/fix-libcontainerd-data-race
...
Fix data race in libcontainerd
Upstream-commit: 0a96ba8a0f6b98d82fe2f8f4e07838785cb8d708
Component: engine
2016-07-14 17:27:24 +02:00
d37c862586
Merge pull request #24630 from eskaaren/status_409
...
Status code 409 received when conflicting name when creating container
Upstream-commit: e056b4e370077bbc92e27762e2843895e83dcd12
Component: engine
2016-07-14 15:26:21 +02:00
51ece55ad4
Status code 409 received when conflicting name when creating container
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 5bf46cc43624f230fae80430dd9d1d5f494c0c95
Component: engine
2016-07-14 14:58:43 +02:00
d2af4bb5e5
Merge pull request #24628 from vdemeester/service-doc-fixes
...
Service doc fixes
Upstream-commit: e7e9f753e81110b7d5845663690e741388528640
Component: engine
2016-07-14 11:38:07 +02:00
c6ba347661
Merge pull request #24588 from justincormack/nonewprivsdoc
...
Expand the documentation of "no-new-privileges"
Upstream-commit: 9c5782280c0143d061be119e93312099a8e7effc
Component: engine
2016-07-14 11:34:33 +02:00
d0a542295a
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 >
Upstream-commit: cc651bc642e3478062416b50171dbf5595daf4e4
Component: engine
2016-07-14 11:23:03 +02:00
d221553eec
Update service update commandline reference docs
...
Update with the new remove flags
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dbe310eff05cf5b67eab99d3cfff66c2680d01ac
Component: engine
2016-07-14 11:22:18 +02:00
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
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
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
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
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
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
60762d8a86
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 >
Upstream-commit: 19d48f0b8ba59eea9f2cac4ad1c7977712a6b7ac
Component: engine
2016-07-13 13:30:24 -07:00
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
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
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
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
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
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
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
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
8a49e1f925
Fix data race in libcontainerd
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8e9fbc8f5fc5759eb7f26ec998f227994ff6c642
Component: engine
2016-07-13 10:04:42 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
