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

24988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tõnis Tiigi
18a20c859f Merge pull request #23602 from crosbymichael/bump-libnetwork 
Update libnetwork to 96d45528599c32354230480a1ebc0
 2016-06-15 19:01:29 -07:00
Sven Dowideit
1ba9e3cba4 Merge pull request #23604 from londoncalling/getstarted-tutorial-updates 
fixing links, images and missing files in Getting Started tutorial
 2016-06-16 11:50:28 +10:00
Victoria Bialas
1d80f8ca19 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>
 2016-06-15 18:37:50 -07:00
Sebastiaan van Stijn
0c78a7dd64 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.
 2016-06-16 02:43:13 +02:00
Michael Crosby
e927df7b4b Update libnetwork to 96d45528599c32354230480a1ebc0 
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-15 15:07:04 -07:00
Arnaud Porterie
eab3a1fa55 Merge pull request #23565 from SvenDowideit/fix-links-tutorials 
fix links for #23505
 2016-06-15 21:24:22 +00:00
Brian Goff
011774e6f0 Merge pull request #23542 from mavenugo/aliases 
Use service alias and configure service VIP or dns-rr
 2016-06-15 16:18:50 -04:00
Brian Goff
8510adf8c8 Merge pull request #23579 from tonistiigi/fix-ci-hang 
Fix hanging integration tests
 2016-06-15 14:49:54 -04:00
Alexander Morozov
64eb01caf6 Merge pull request #23538 from anusha-ragunathan/incremental-builds 
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
 2016-06-15 10:53:31 -07:00
Tonis Tiigi
22f827abab Fix hanging integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-15 10:19:45 -07:00
Arnaud Porterie
480d7b310b Merge pull request #23301 from runcom/tmpfs-trump 
daemon: allow tmpfs to trump over VOLUME(s)
 2016-06-15 17:11:00 +00:00
Antonio Murdaca
756f6cef4a daemon: allow tmpfs to trump over VOLUME(s) 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-06-15 16:01:51 +02:00
Vincent Demeester
b6a8a3da10 Merge pull request #23557 from AkihiroSuda/fix-exp-doc 
Update experimental/README.md
 2016-06-15 13:34:25 +02:00
Akihiro Suda
fec98ecca1 Update experimental/README.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-06-15 19:14:51 +09:00
Vincent Demeester
e08aed59df Merge pull request #23322 from tkopczynski/20784-builder-dockerfile-symlink 
Reimplement integration test for symlink Dockerfile as a unit test
 2016-06-15 10:52:49 +02:00
Sven Dowideit
fa94eb4604 fix links for #23505 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-15 04:46:40 +00:00
Sven Dowideit
da15923559 Merge pull request #23505 from londoncalling/add-getstarted-tutorial 
ready for merge: surfacing Learn by example topics to top level of Docker Engine docs
 2016-06-15 14:18:09 +10:00
Victoria Bialas
0254c12e1e 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>
 2016-06-14 21:08:44 -07:00
Arnaud Porterie
8821233282 Merge pull request #23555 from dperny/change-manager-status-col 
Remove the node leader column, show leader as status.
 2016-06-15 03:55:12 +00:00
Tibor Vass
59ef209242 Merge pull request #23561 from tiborvass/bump_api_version_to_v1.25 
Bump API Version to v1.25
 2016-06-14 20:18:17 -07:00
Tibor Vass
04292192e0 Bump API Version to v1.25 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-14 20:03:50 -07:00
Madhu Venugopal
07e39e9e72 Use service alias and configure container's --net-alias 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-14 19:50:34 -07:00
Madhu Venugopal
5af8e2a9c0 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-14 19:50:34 -07:00
Madhu Venugopal
f2f97f768e Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-14 19:50:34 -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
Drew Erny
4104c1dc13 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>
 2016-06-14 17:50:02 -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