69d60f8bcb
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 17ae6539f6bfc20792d0a25b3f98adfce96e7337
Component: engine
2016-06-18 13:47:12 -07:00
e75e9b54a9
update cli commands output for rc1, revise key concepts
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 9499d5fd522e2fa31e5d0458c4eb9b420f164096
Component: engine
2016-06-18 11:38:27 -07:00
14409cb989
bad url
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45
Component: engine
2016-06-18 13:00:38 +00:00
e7f24f4bb5
href links are not converted from file.md by hugo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ad1819ca1d56a0e2caae2f0f28d14a456686e00b
Component: engine
2016-06-18 12:44:38 +00:00
6200f441cd
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf
Component: engine
2016-06-17 17:28:24 -07:00
531b88d2e3
Merge pull request #23658 from londoncalling/mac-win-install-updates
...
install mac and win pared down, link to d4mac, d4win, getting started…
Upstream-commit: 2b865dbc3a94675478a9d6faae480ff447cc75de
Component: engine
2016-06-18 07:49:04 +10:00
9b853ff739
install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
...
fixing links to d4mac and d4win
updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.
updates per Sven's comments in the PR
removed duplicate line in tutorials menu.md
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
2016-06-17 14:46:35 -07:00
913871096c
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
2016-06-16 21:44:07 -07:00
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
1c57d98347
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
2016-06-16 18:06:02 -07:00
d74065d7d9
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
2016-06-16 16:29:23 -07:00
1e8aef0b45
Merge pull request #23633 from thaJeztah/fix-advisory-meta
...
docs: move "advisory" to general metadata
Upstream-commit: ef9c058b67b181fc5084ead0bafcca410863726c
Component: engine
2016-06-16 14:55:11 -07:00
c0b4786bbf
Fix API 1.25 order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6891fead3675a31a9a98a0f19a80c96ebc393afd
Component: engine
2016-06-16 12:07:29 -07:00
bcf7be1ed0
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: aadd88c306d43b401a18a29efafa714f64f87894
Component: engine
2016-06-16 11:52:34 -07:00
e787e67ec5
advisory can't be in the [menu] section
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: bc033cb706fd22e3934968b0dfdf93da962e36a8
Component: engine
2016-06-16 11:59:47 +00:00
fc28f1b8ca
Merge pull request #23601 from dnephin/change_header
...
Change SCALE to REPLICAS.
Upstream-commit: 8ab79f1f7035288743882a6f0fa8bacc6c8454fa
Component: engine
2016-06-16 04:18:49 +00:00
cb9a8acf9f
fixing links and merge conflicts
...
updated link to faqs/troubleshoot to point to new location /toolbox
fixed docker-for-mac link error
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 1d80f8ca193139755de935fa6567a32734038cac
Component: engine
2016-06-15 18:37:50 -07:00
dd45c05df9
Merge pull request #23510 from sbose78/23376-update-centos-yum-repo-version
...
Fixes #23376 Broken URL for Centos yum repo for docker fixed to harcoded version number.
Upstream-commit: 0c78a7dd64c4c0b11aae040fadbecee2a7fdf5ae
Component: engine
2016-06-16 02:43:13 +02:00
93b2574efc
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
965831ca81
fix links for #23505
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fa94eb46041ad309468dbbd29faba2053f402096
Component: engine
2016-06-15 04:46:40 +00:00
a15b623c8b
Merge pull request #23505 from londoncalling/add-getstarted-tutorial
...
ready for merge: surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: da159235595359024ecb63332538c6696f7eb49e
Component: engine
2016-06-15 14:18:09 +10:00
8fead059d3
surfacing Learn by example topics to top level of Docker Engine docs
...
fixing links after moving surfacing tutorials
fixing more links for the newly located tutorials
WIP: merging 3 getting started tutorials into one to cover all platforms, added new files
fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 0254c12e1e0be7a93e3b28e61586ac66168a9b7c
Component: engine
2016-06-14 21:08:44 -07:00
1de46d8dd4
Bump API Version to v1.25
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 04292192e023372453983cf6318f772922928c4e
Component: engine
2016-06-14 20:03:50 -07:00
09430f24ff
Merge pull request #23553 from icecrime/heartbeat_as_duration
...
Make `--dispatcher-heartbeat-period` a duration
Upstream-commit: 2e9aac59e20ee376da32c5c85e1b392fc555f9c9
Component: engine
2016-06-15 02:36:17 +00:00
0b871ed824
Make --dispatcher-heartbeat-period a duration
...
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb
Component: engine
2016-06-14 18:10:49 -07:00
a1a5b6649c
Merge pull request #23548 from vieux/no_more_reject
...
no more 'docker node reject' in docs
Upstream-commit: e087ba4633c948f00ca3d92c9906fc4cc5db06db
Component: engine
2016-06-15 00:43:58 +00:00
3c08c9d8dd
Merge pull request #23446 from tiborvass/plugins-experimental
...
Plugins: experimental support for new plugin management
Upstream-commit: 6ed921dc38be582939966f71a01ec10f03ed531f
Component: engine
2016-06-14 20:32:14 -04:00
636f39c7bd
Merge pull request #23546 from sfsmithcha/formatting_updates_and_revisions
...
update formatting for variables, clarify text in certain topics
Upstream-commit: 93daa10e3ed326ce01cd18904824b0406fe86eb1
Component: engine
2016-06-14 17:04:59 -07:00
b431a2061e
Merge pull request #23547 from icecrime/update_api_reference
...
Update API reference
Upstream-commit: 381a15279374b482a8257ee277488ae562cf61a1
Component: engine
2016-06-14 17:04:34 -07:00
954ba685a5
Update API reference
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 98880d8b3938a5cb1b5d7970cbb8efb849a9f97d
Component: engine
2016-06-14 16:41:10 -07:00
31529f7e86
update formatting for variables, clarify text in certain topics
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 7b0c3066e30d721fb9efbac74e9675e1baeb019a
Component: engine
2016-06-14 16:35:40 -07:00
ac4f3c4188
docker plugin commandline reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e79873c27c2b3f404db02682bb4f11b5a046602e
Component: engine
2016-06-14 15:50:00 -07:00
d3cd4d14aa
Merge pull request #23415 from aboch/ll
...
Allow user to specify container's link-local addresses
Upstream-commit: c97fdbe3c5954b2685a8b140f595f06b09191956
Component: engine
2016-06-14 15:47:54 -07:00
896826cadf
docs: move sysctls docs to current API version
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: de22669377d074a2594de33be01ae4d9723283a8
Component: engine
2016-06-14 15:14:16 -07:00
60c51154d7
no more 'docker node reject' in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c21f8613275ca546b1310999d8714ff2609f33e3
Component: engine
2016-06-14 14:55:25 -07:00
6c19b5ff61
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00
811cef6ca3
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7b2e5216b89b4c454d67473f1fa06c52a4624680
Component: engine
2016-06-14 07:47:31 -07:00
f3176ba51f
Merge pull request #23489 from thaJeztah/fix-indentation
...
API docs cleanup
Upstream-commit: c913dd5f575c877b93a812c8f57dcc212d566b87
Component: engine
2016-06-14 21:49:48 +10:00
b2d3f0c2e7
Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
...
surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: 2a96ac66ea41d206161a6ef022e10d53f99e86ec
Component: engine
2016-06-14 21:10:17 +10:00
c8d6ba6b3c
Fixes #23376 Broken URL for Centos yum repo for docker changed to now have a hardcoded centos version 7
...
Signed-off-by: Shoubhik Bose <sbose78@gmail.com >
Upstream-commit: d3fad80cc7823eddb823dd53424a28ee81043f18
Component: engine
2016-06-14 10:06:00 +00:00
2f81321106
add tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: ea4fef2d875de39044ca7570c35365b75086e8a5
Component: engine
2016-06-13 22:17:15 -07:00
69f307bc8b
CLI docs
...
Signed-off-by: Amit Shukla <amit.shukla@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9acf97b72a4d5ff7b1bcad36fb19b53775f01596
Component: engine
2016-06-13 22:17:15 -07:00
429bf7a983
Add swarm api reference docs
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: d4abe1d84a58461fea54d2046c24ae5d869fa41e
Component: engine
2016-06-13 22:16:18 -07:00
9ada0cfc5f
Merge pull request #23213 from crosbymichael/restore-option
...
Add --live-restore flag
Upstream-commit: 3020081e94277410984c62d12f88de3d4f258681
Component: engine
2016-06-13 20:57:19 -07:00
7af900395b
Add --live-restore flag
...
This flags enables full support of daemonless containers in docker. It
ensures that docker does not stop containers on shutdown or restore and
properly reconnects to the container when restarted.
This is not the default because of backwards compat but should be the
desired outcome for people running containers in prod.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d705dab1b1bd0a946d647374325d61fac57736db
Component: engine
2016-06-13 19:16:26 -07:00
384a0525c9
Merge pull request #23447 from Microsoft/RemoveQosValidation
...
Removed QoS validation on Windows
Upstream-commit: bfed05be0b9bfc04bf922d79dd8dc420e1e579e2
Component: engine
2016-06-13 14:47:06 -07:00
ce19593c15
surfacing Learn by example topics to top level of Docker Engine docs
...
fixing links after moving surfacing tutorials
fixing more links for the newly located tutorials
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 8eca8089fa35f652060e86906166dabc42e556f8
Component: engine
2016-06-13 13:32:30 -07:00
7bec8a2e7d
Merge pull request #22126 from dmcgowan/overlay-native-diff
...
Overlay multiple lower directory support
Upstream-commit: 8a2f9a249c28c0a80bac4b41eb318dfe68f63f0d
Component: engine
2016-06-13 13:15:39 -07:00
2fe8f9bbb3
Merge pull request #23195 from cyli/update-content-trust-docs
...
Update content trust docs to reflect latest notary compose file changes
Upstream-commit: 1842077541d1679c20932ed66c07081759c36c7f
Component: engine
2016-06-13 22:11:32 +02:00
b0a6df1b32
Update content trust docs to reflect latest notary compose file changes, and to simplify
...
the instructions by providing a single compose file that runs the notary server, registry,
and a docker-in-docker trust sandbox.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: ba115b0a91970f434e41e9f72caccc01493a9729
Component: engine
2016-06-13 12:57:06 -07:00
