docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,056 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

25056 Commits

Author SHA1 Message Date
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
Daniel Nephin 3c35da6029 Add tests for AutoAcceptOption 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c544649874bfecf2e6b8a00a0b25db309d81cf94)
 2016-06-18 20:58:24 -07:00
Daniel Nephin e090e2dbd4 Support a listen addr without a port, and add tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 595e79b805fd6e96d2e6c8876f7c9734164f5db7)
 2016-06-18 20:58:24 -07:00
Victor Vieux 6b2cd6e843 accept uppercase endpoint mode 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 8a0c5f157892efdfd5119410adedf0f04c9c16cf)
 2016-06-18 20:58:24 -07:00
Jana Radhakrishnan 0728f28cbe Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 64a567d24c147379dc79b54cf2140c4e7905c022)
 2016-06-18 20:58:24 -07:00
tomwbarlow@gmail.com 9e1d592de3 Change log.printf service creation msg to debug 
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
(cherry picked from commit eed8d14ed16846f926e2d139e8232fbc2d4641e4)
 2016-06-18 20:58:24 -07:00
Arnaud Porterie (icecrime) f1f2461e09 Change `docker service update` semantics 
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
(cherry picked from commit 1f8ab93b4422a88ef3053105c17acf1933576fbe)
 2016-06-18 20:58:23 -07:00
Harald Albers ffb4daf0fb fix bash completion for `docker service` subcommands 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145)
 2016-06-18 20:58:23 -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
Tibor Vass 906eacd586 Bump VERSION to v1.12.0-rc2 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 16:28:45 -04:00
Tibor Vass 02772750e1 Merge pull request #23594 from tiborvass/changelog-fix 
v1.12.0: some fixes to CHANGELOG
 2016-06-17 13:25:47 -07:00
Tibor Vass 2ba4108c95 Merge pull request #23661 from tiborvass/cherry-picks-for-1.12.0-rc2 
Cherry picks for 1.12.0 rc2
 2016-06-17 13:20:10 -07:00
Tibor Vass 11daa3e417 v1.12.0: some fixes to CHANGELOG 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 13:18:49 -07:00
Arnaud Porterie (icecrime) 944a8f16c7 Improve `docker service inspect --pretty` 
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
(cherry picked from commit 3c60b7b9843276082c0ba4b868f354b9b44e9627)
 2016-06-17 13:09:13 -07:00
Tibor Vass 70bd46293a plugins: fix name handling for legacy plugins 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8ba17b4823f9a1a40a405905613667d97bb24546)
 2016-06-17 13:09:13 -07:00
Vincent Demeester 6eaac7be89 Update plugin command with defaulttag 
This way, you don't have to specify the ":latest" tag for some command
and not for others

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit cb321e82db662f5190a6d83a90677a9dd9fdcd31)
 2016-06-17 13:09:13 -07:00
Tibor Vass 2ae7330140 plugins: fix usage for plugin commands 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 65ed9daf70ccf0027f4eac8049667130deb249ed)
 2016-06-17 13:09:12 -07:00
Tibor Vass 1cfd620124 plugins: remove automatic mounting of a state dir 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 15ff9de65801178a522c445ff9fb8964e21d12a0)
 2016-06-17 13:09:12 -07:00
Tibor Vass f24e5d79bc plugins: install should not automatically accept all permissions 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 4b70d4561e4a9b57d80b70cfebc50831e230735a)
 2016-06-17 13:09:12 -07:00
Jana Radhakrishnan a7c925cba4 Vendoring libnetwork @13be89d1cf79 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 70e2585d545e18757222b8ccfb21514fde7c42f4)
 2016-06-17 13:09:12 -07:00
Tonis Tiigi bbc214fa9b Add newline to promote/demote message 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 3386e3570a1251bbea5302d8b8e639aaf68436c3)
 2016-06-17 13:09:12 -07:00
Jana Radhakrishnan 8fdc925338 Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 4fea81154b817b09e553308a1595bfd97a8c0582)
 2016-06-17 13:09:12 -07:00
Anil Madhavapeddy 4b2883fac6 `docker swarm`: more consistent CLI help 
This changes `docker swarm help` to be consistent with capitals
and removes full stops.

Before:

```
Commands:
  init        Initialize a Swarm.
  join        Join a Swarm as a node and/or manager.
  update      update the Swarm.
  leave       Leave a Swarm.
  inspect     Inspect the Swarm
```

After:

```
Commands:
  init        Initialize a Swarm
  join        Join a Swarm as a node and/or manager
  update      Update the Swarm
  leave       Leave a Swarm
  inspect     Inspect the Swarm
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
(cherry picked from commit 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8)
 2016-06-17 13:09:12 -07:00
Ke Xu 05c32e7f08 fix #23017, add zsh completion for dockerd 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
(cherry picked from commit bd1fc1e5c26b954fb35f7adda46d764d80a1a570)
 2016-06-17 13:09:11 -07:00
Anusha Ragunathan 82608cd4ce Add disable flag for plugin Install. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4)
 2016-06-17 13:09:11 -07:00
Harald Albers fcdd4d4a52 bash completion for `docker swarm update --cert-expiry` 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit dc2fc75d4260767937d98ea81c51fdea148162b2)
 2016-06-17 13:09:11 -07:00
Justin Cormack 445f4f2f3e Missing line feed after accepting node 
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit c34d752419f0e9c17aa759df1a8314974b0d17ed)
 2016-06-17 13:09:11 -07:00
Justin Cormack b7a1f1a2d1 fix invalid typo in error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit 2322ccb8fff46a4d3a84f3ef214cb473816374af)
 2016-06-17 13:09:11 -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
Daniel Nephin fb364d86fa Add some tests for bundlefile and improve the error messages for LoadFile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c0ea589c1b27f8b68e84cfe6692a7639da52ce6d)
 2016-06-16 23:36:59 -07:00
Victor Vieux d747fbc95c improve some messages in the node subcmds 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit eb962235fbf1579cf36bb0582347e8639ec47205)
 2016-06-16 23:36:58 -07:00
Tonis Tiigi 0efe76c62b Add integration test for parsing swarm update options 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit a933ac3c27ac88cf69a2bc2bc16ce076486c0206)
 2016-06-16 23:36:58 -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
Brian Goff 9647e4d6cc Implement plugin restore after daemon restart 
This ensures that:

- The in-memory plugin store is populated with all the plugins
- Plugins which were active before daemon restart are active after.
  This utilizes the liverestore feature when available, otherwise it
  manually starts the plugin.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit dfd91873056c172ffc061d882da0cd18204b521a)
 2016-06-16 23:36:58 -07:00
Brian Goff be82ff5c7f Fix removing plugins 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 5e156fd3d4b21267caca093dd0df7ed6bce85535)
 2016-06-16 23:36:58 -07:00
Tonis Tiigi efc10a92ef Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 826f6f07031abc4dea6f71ed69d33a4e0789ee11)
 2016-06-16 23:36:58 -07:00
Victor Vieux 3635938b00 add some more fields in docker service inspect -p 
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 4c9e21b674046e8a3819cfbbb96f471bd280fba5)
 2016-06-16 23:36:58 -07:00
Tonis Tiigi 0cac3c4c23 Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 1973cee0cd86da3c7b7002a3fed7af2557df538c)
 2016-06-16 23:36:57 -07:00
Tonis Tiigi 01c5b208e8 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit a83bba467a8bd24924b1a0cf55b954ac49937b5b)
 2016-06-16 23:36:57 -07:00
Tonis Tiigi 528f3ab668 Update swarmkit to 310f1119 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2783568284a0c84bbb53df3c40295d27a151889e)
 2016-06-16 23:36:57 -07:00
Derek McGowan 56b253fb3c Do not show empty tags for digest references in output 
When a repository has a tag and digests, show tag for each digest value.
Do not duplicate rows for the same image name with both tag and digest.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 79eada38141dca71f5195df59882f1cb46657640)
 2016-06-16 23:36:57 -07:00
Sebastiaan van Stijn b3387e96ed fix "overlay" -> "overlay2" in error message 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2d4b285a75621604f31058a43cb5ef1d4618533e)
 2016-06-16 23:36:57 -07:00
Vincent Demeester 42f445565d Update ServiceInspectWithRaw 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 4a70cb55710a76ee7dfa059c440c34fd6cb84f16)
 2016-06-16 23:36:57 -07:00
Vincent Demeester d9d24b6605 Update docker plugin install code… 
… for more consistency (api side).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 2c82337b0490dc0a5b8329d1f23c6bad00d8551b)
 2016-06-16 23:36:57 -07:00
Vincent Demeester 7444bb2c25 Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 58529a15535ee2accafdde740214c0d5b595d6e1)
 2016-06-16 23:36:56 -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
Madhu Venugopal ed01cfc6db Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed 
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54)
 2016-06-16 23:36:56 -07:00