beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24981 commits 14 branches 412 tags 338 MiB
Commit graph

24981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
cdb04519e2 Update libnetwork to 96d45528599c32354230480a1ebc0 
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit e927df7b4b)
 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 1d80f8ca19)
 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 d3fad80cc7)
 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 fa94eb4604)
 2016-06-16 23:36:52 -07:00
Madhu Venugopal
60a86590aa Use service alias and configure container's --net-alias 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 07e39e9e72)
 2016-06-16 23:36:51 -07:00
Madhu Venugopal
588b76c2a1 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 5af8e2a9c0)
 2016-06-16 23:36:51 -07:00
Madhu Venugopal
f1d5c3374c Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit f2f97f768e)
 2016-06-16 23:36:51 -07:00
Tonis Tiigi
ca16a4c81d Fix hanging integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 22f827abab)
 2016-06-16 23:36:51 -07:00
Antonio Murdaca
034d555d30 daemon: allow tmpfs to trump over VOLUME(s) 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 756f6cef4a)
 2016-06-16 23:36:51 -07:00
Akihiro Suda
ce6211d252 Update experimental/README.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit fec98ecca1)
 2016-06-16 23:36:51 -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 0254c12e1e)
 2016-06-16 23:36:50 -07:00
Drew Erny
c816f2c905 Remove the node leader column, show leader as status. 
Removes the leader column from node ls and shows whether a node is the
leader in the manager status column instead.

Signed-off-by: Drew Erny <drew.erny@docker.com>
(cherry picked from commit 4104c1dc13)
 2016-06-16 23:36:50 -07:00
Michael Crosby
be67aae778 Merge pull request #23627 from mlaventure/update-runc-on-1.12 
Update runc on 1.12
 2016-06-16 14:30:54 -07:00
Kenfe-Mickael Laventure
301f3d776f Revert build-{deb,rpm} to cloning from opencontainers repository 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-16 09:06:53 -07:00
Kenfe-Mickael Laventure
9eb6e049bd Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit b675124cf5)
 2016-06-16 08:46:23 -07:00
Tibor Vass
1f136c1f85 bump VERSION to v1.12.0-rc1 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-15 00:36:32 -04:00
Michael Crosby
c293f64dc0 Merge pull request #23564 from tiborvass/fix-changelog 
v1.12.0: fixed date in CHANGELOG to be in YYYY-MM-DD form
 2016-06-14 21:35:39 -07:00
Tibor Vass
adbf43fe10 v1.12.0: fixed date in CHANGELOG to be in YYYY-MM-DD form 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-14 21:33:17 -07:00
Arnaud Porterie
aab402731f Merge pull request #23563 from icecrime/i_trust_crosbymichael 
Use runc from crosbymichael's fork
 2016-06-15 04:14:13 +00:00
Arnaud Porterie (icecrime)
e2b7f648f4
Use runc from crosbymichael's fork 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-06-14 21:10:38 -07:00
Tibor Vass
427738d81f v1.12.0: first draft of CHANGELOG additions 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-14 20:12:57 -07:00
Arnaud Porterie
9ba0504923 Merge pull request #23554 from vieux/node_update_name 
fix docker node update via name
 2016-06-15 02:36:42 +00: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
bd92dd29b9 Merge pull request #23531 from tonistiigi/rm-race 
Fix race on force deleting container created by task
 2016-06-15 02:33:56 +00:00
Arnaud Porterie
91197953d0 Merge pull request #23524 from aboch/restore 
Daemon to support network restore
 2016-06-15 02:33:16 +00:00
Arnaud Porterie
574f7d2149 Merge pull request #23551 from tonistiigi/update-swarmkit 
Update swarmkit to 25572005f
 2016-06-15 02:25:31 +00:00
Arnaud Porterie
c0677565dc Merge pull request #23522 from docker/swarm-stack 
Add experimental Docker Stack CLI commands
 2016-06-15 02:22:01 +00:00
Tõnis Tiigi
aa1b507af6 Merge pull request #23552 from vieux/prevent_panics 
prevent some panics in 'service update'
 2016-06-14 19:08:46 -07: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
Michael Crosby
cd03a68d31 Merge pull request #23530 from crosbymichael/exp-tests 
Kill containers after restart tests
 2016-06-14 17:43:52 -07: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
Tonis Tiigi
b38408fd02 Update drain test 
With the rolling update there can be a possibility
that the container count matches the update has
completely finished yet.

The actual bug for the flakiness was fixed with the
swarmkit update.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 17:25:17 -07:00
Tonis Tiigi
25a89d73e5 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 17:23:35 -07:00
Tonis Tiigi
cdf279d74d Update swarmkit to 25572005f 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 17:07:14 -07: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
Tonis Tiigi
dcfe99278d Fix race on force deleting container created by task 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 16:49:04 -07:00
Lei Jitang
7d0689a8d3 Add test case for network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-06-14 16:45:30 -07:00
Lei Jitang
ecffb6d58c Daemon to support network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-06-14 16:45:25 -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
Michael Crosby
e07d78d247 Kill containers after restart tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-14 16:17:36 -07:00
Michael Crosby
8a6cb9c19f Merge pull request #23535 from dmcgowan/cleanup-symlinks-overlay2 
Remove symlinks on layer removal for overlay2
 2016-06-14 16:08:34 -07:00
Sebastiaan van Stijn
93ef595eb5 Merge pull request #23476 from mgoelzer/docker112_bash_completions 
Bash tab completions for subcommands swarm, service and node
 2016-06-15 00:55:40 +02:00
Victor Vieux
78a48af37b fix docker node update via name 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-14 15:55:34 -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
Arnaud Porterie
a0e992eff7 Merge pull request #23525 from dnephin/fix_service_update_repliacs 
Fix service update replicas
 2016-06-14 22:41:08 +00:00
Victor Vieux
1d380243fc prevent some panics in 'service update' 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-14 15:37:27 -07:00