centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 00:38:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
25,121 Commits 54 Branches 28 Tags
e546ffb37ad205cb66e243d0acf00a23685e3cef
Commit Graph

5397 Commits

Author SHA1 Message Date
Serhat Gülçiçek
f4de46d2ac Fix error for env variables example in docker reference - 2 
The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.

When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe2, except only for one occurrence.

Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
(cherry picked from commit 7a30fa7af6f0bb3850ce6167850642420b4c0633)
 2016-06-30 16:47:46 -07:00
Sven Dowideit
eaf5b17592 Removing some url links that can be resolved using src markdown links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 01f9cbc3663cf134ca427e4f8b98bba637f6655e)
 2016-06-30 16:47:46 -07:00
David M. Karr (fullname at gmail.com)
6de8049ab5 Update work-with-networks.md 
The value of the Subnet and Gateway properties didn't match the command-line argument.

Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
(cherry picked from commit a54c3fbb8aa024c477864a0614506da3ea185839)
 2016-06-30 16:47:46 -07:00
orkaa
d4cdc5172c For the lulz! (evalulate -> evaluate) 
Signed-off-by: orkaa <orkica@gmail.com>
(cherry picked from commit 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0)
 2016-06-30 16:47:45 -07:00
Kai Qiang Wu(Kennan)
db4153cc90 Fix the missing 'ls' 
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
(cherry picked from commit cbd240581f274c3599efb1c43b01cb61607c79d0)
 2016-06-30 16:47:43 -07:00
Eric Barch
060b6c4363 Add missing words in the swarm docs 
Signed-off-by: Eric Barch <barch@tomesoftware.com>
(cherry picked from commit db158e9182f86adc721d6c401782983bfe51fd49)
 2016-06-30 16:47:43 -07:00
bin liu
6a5a150722 fix some typos 
Signed-off-by: bin liu <liubin0329@gmail.com>
(cherry picked from commit 950073aabb305db6156709ea8509b1f72ff06f3b)
 2016-06-30 16:47:43 -07:00
Sven Dowideit
3d5903a45f Now that the Docker4 links are online, we can use them 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9)
 2016-06-30 16:47:42 -07:00
Akihiro Suda
ba77356d98 Add overlay2 description to overlayfs-driver.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b)
 2016-06-30 16:47:42 -07:00
Shishir Mahajan
16274ba940 PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run. 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
(cherry picked from commit fe6416d04fb3ccd83fe4fb3a73f0364b88da730a)
 2016-06-30 16:47:41 -07:00
Kevin Jing Qiu
c7d35daad8 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
(cherry picked from commit 3b2ee9a704f1e3974dbb9ce857886d5e377580ab)
 2016-06-30 16:47:40 -07:00
Sebastiaan van Stijn
1b053efb5a Sync API changes from 1.25 -> 1.24 
commit 79e1d3877a1b1697028399b8ce39c4ee27b60a96
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.

This updates the 1.24 API with the same changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 93095b1699eb11e1bd256dcf8f42f34f50ec2c78)
 2016-06-30 16:47:40 -07:00
Charles Smith
803b4d30a6 clarify swarm concept 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e0296317131782008dcb94c72d591244663d61b1)
 2016-06-30 16:47:40 -07:00
Charles Smith
3f276b58a5 update docker swarm cli 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 78ebfaff1a426425573c440c24eb0f36ffed4d8c)
 2016-06-30 16:47:39 -07:00
Charles Smith
1784366694 add links to swarm and service commands to swarm mode overview 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit c13c5601961bb5ea30e21c9c8c469dd55a2f17d0)
 2016-06-30 16:47:37 -07:00
Yong Tang
abb6e38208 Fix reference link error in Jenkins docs failure 
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa)
 2016-06-30 16:47:37 -07:00
Charles Chan
fe2a9bea38 Update help output to match Docker 1.11. 
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 17ae6539f6bfc20792d0a25b3f98adfce96e7337)
 2016-06-18 20:58:25 -07:00
Charles Smith
dd39dbe79c update cli commands output for rc1, revise key concepts 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 9499d5fd522e2fa31e5d0458c4eb9b420f164096)
 2016-06-18 20:58:25 -07:00
Sven Dowideit
e8e1fbb72f bad url 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45)
 2016-06-18 20:58:25 -07:00
Sven Dowideit
d546db33ff href links are not converted from file.md by hugo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit ad1819ca1d56a0e2caae2f0f28d14a456686e00b)
 2016-06-18 20:58:24 -07:00
Sebastiaan van Stijn
d5c89ec65e Add initial "service" docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf)
 2016-06-18 20:58:23 -07:00
Victoria Bialas
d1c91b41e1 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>
(cherry picked from commit 5bc730eda76351ab669a60a5fc95fd273e399d88)
 2016-06-18 20:58:23 -07:00
Charles Smith
aa1f241894 update output for node commands, minor edits 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 3b2132c2c7f277750edfd9fc76d73dbb9142fde2)
 2016-06-16 23:36:59 -07:00
Tonis Tiigi
ab6abb799b Add cert-expiry to swarm update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56)
 2016-06-16 23:36:58 -07:00
Sebastiaan van Stijn
fdb5324595 Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42)
 2016-06-16 23:36:56 -07:00
Sebastiaan van Stijn
c73e56fd7f docs: move "advisory" to general metadata 
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aadd88c306d43b401a18a29efafa714f64f87894)
 2016-06-16 23:36:55 -07:00
Sven Dowideit
af3b1c7370 advisory can't be in the [menu] section 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit bc033cb706fd22e3934968b0dfdf93da962e36a8)
 2016-06-16 23:36:54 -07:00
Daniel Nephin
41d72e28c3 Change SCALE to REPLICAS. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4df03499486a7f62f94bd1fb8e2625b0ef932fe5)
 2016-06-16 23:36:52 -07:00
Victoria Bialas
38305cb676 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>
(cherry picked from commit 1d80f8ca193139755de935fa6567a32734038cac)
 2016-06-16 23:36:52 -07:00
Shoubhik Bose
2b36087597 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>
(cherry picked from commit d3fad80cc7823eddb823dd53424a28ee81043f18)
 2016-06-16 23:36:52 -07:00
Sven Dowideit
7af9b80f23 fix links for #23505 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit fa94eb46041ad309468dbbd29faba2053f402096)
 2016-06-16 23:36:52 -07:00
Victoria Bialas
92ff142da2 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>
(cherry picked from commit 0254c12e1e0be7a93e3b28e61586ac66168a9b7c)
 2016-06-16 23:36:50 -07:00
Arnaud Porterie
2e9aac59e2 Merge pull request #23553 from icecrime/heartbeat_as_duration 
Make `--dispatcher-heartbeat-period` a duration
 2016-06-15 02:36:17 +00:00
Arnaud Porterie (icecrime)
e6e1fd5d06 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>
 2016-06-14 18:10:49 -07:00
Arnaud Porterie
e087ba4633 Merge pull request #23548 from vieux/no_more_reject 
no more 'docker node reject' in docs
 2016-06-15 00:43:58 +00:00
Brian Goff
6ed921dc38 Merge pull request #23446 from tiborvass/plugins-experimental 
Plugins: experimental support for new plugin management
 2016-06-14 20:32:14 -04:00
Tibor Vass
93daa10e3e Merge pull request #23546 from sfsmithcha/formatting_updates_and_revisions 
update formatting for variables, clarify text in certain topics
 2016-06-14 17:04:59 -07:00
Tibor Vass
381a152793 Merge pull request #23547 from icecrime/update_api_reference 
Update API reference
 2016-06-14 17:04:34 -07:00
Arnaud Porterie (icecrime)
98880d8b39 Update API reference 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-06-14 16:41:10 -07:00
Charles Smith
7b0c3066e3 update formatting for variables, clarify text in certain topics 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-14 16:35:40 -07:00
Sebastiaan van Stijn
e79873c27c docker plugin commandline reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-14 15:50:00 -07:00
Michael Crosby
c97fdbe3c5 Merge pull request #23415 from aboch/ll 
Allow user to specify container's link-local addresses
 2016-06-14 15:47:54 -07:00
Alexander Morozov
de22669377 docs: move sysctls docs to current API version 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-06-14 15:14:16 -07:00
Victor Vieux
c21f861327 no more 'docker node reject' in docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-14 14:55:25 -07:00
Alessandro Boch
1c4efb6aa0 Allow user to specify container's link-local addresses 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-06-14 14:28:33 -07:00
Kenfe-Mickael Laventure
7b2e5216b8 Add support for multiples runtimes 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-14 07:47:31 -07:00
Sven Dowideit
c913dd5f57 Merge pull request #23489 from thaJeztah/fix-indentation 
API docs cleanup
 2016-06-14 21:49:48 +10:00
Sven Dowideit
2a96ac66ea Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12 
surfacing Learn by example topics to top level of Docker Engine docs
 2016-06-14 21:10:17 +10:00
Charles Smith
ea4fef2d87 add tutorial 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-13 22:17:15 -07:00
Amit Shukla
9acf97b72a CLI docs 
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-13 22:17:15 -07:00