Adam Harrison
1c0ffbc177
Stop publishing historic versions
2016-08-10 11:12:23 +01:00
Adam Harrison
f544da9e19
Merge branch '1.6'
2016-08-10 10:18:01 +01:00
Adam Harrison
c0592ba1b3
Merge pull request #2470 from weaveworks/no-force-tag
...
Remove -f flag from 'docker tag' commands
2016-08-10 10:17:06 +01:00
Bryan Boreham
0cbf5ca130
Allow 'weave create-bridge', if the user insists.
...
For example this is used when setting up CNI for Kubernetes, in
an environment where we know none of the bad consequences apply.
2016-08-10 10:00:17 +01:00
Adam Harrison
472eab2acd
Merge pull request #2466 from weaveworks/issues/2464-enable-create-bridge
...
Re-enable 'weave create-bridge' in fastdp mode.
2016-08-10 09:57:40 +01:00
Bryan Boreham
7a5d7fca6c
Allow 'weave create-bridge', if the user insists.
...
For example this is used when setting up CNI for Kubernetes, in
an environment where we know none of the bad consequences apply.
2016-08-08 17:20:25 +01:00
Bryan Boreham
081b95dfd0
CNI plugin assigns an IP to the bridge by itself
...
No need to call `weave expose` before use.
2016-08-08 15:28:26 +01:00
Matthias Radestock
faf5b14d8b
make CNI setup work on recent Docker-for-Macs
...
Docker for Mac 1.12.0-rc3 (as of beta18) looks for mounted paths on VM
first, and when it doesn't find them there, it assumes they refer to
paths on the Mac OS host. At which point it will complain that the
paths don't exit.
So instead we mount / since that will always exist on the VM. It's
also what we used to do already when launching the router.
Fixes #2434 .
2016-08-04 22:03:39 +01:00
Bryan Boreham
38958049f4
Remove -f flag from 'docker tag' commands
...
This flag was deprecated in Docker 1.10 and removed in Docker 1.12.
2016-08-04 17:03:35 +01:00
Bryan Boreham
589b45dace
Merge branch '1.6'
2016-08-03 14:34:49 +01:00
Bryan Boreham
7ebf3d7a88
Don't crash when dockerCli is nil
2016-08-03 14:28:05 +01:00
Anita Buehrle
3273d13666
gave points numbers for clarity
2016-08-02 16:40:16 -05:00
abuehrle
5fdbbf3722
wording formatting
2016-08-02 16:38:41 -05:00
abuehrle
14350ff463
added anchor to attaching containers
2016-08-02 16:35:52 -05:00
abuehrle
0b49c961a7
reconfigured note to include additional method
2016-08-02 16:30:32 -05:00
abuehrle
39b80f26ed
made terminology consistent
2016-08-02 13:15:17 -05:00
abuehrle
74b20265e4
fixed links and some titles
2016-08-02 12:59:27 -05:00
abuehrle
358fddb958
fixed broken link and title
2016-08-02 12:52:36 -05:00
abuehrle
5c8f6175b5
added note about net flag
2016-08-02 12:34:52 -05:00
Martynas Pumputis
e8d823d66b
Do not fail launching the proxy if unable to detect dockerd
2016-07-28 12:53:44 +01:00
Adam Harrison
83ce5875ee
Merge branch '1.6'
2016-07-28 12:52:53 +01:00
Adam Harrison
ed83efbceb
Merge pull request #2450 from weaveworks/eval-considered-harmless
...
remove dire warnings about 'eval' when using plugin
2016-07-28 12:49:55 +01:00
Adam Harrison
223116c4bf
Merge pull request #2393 from weaveworks/intro-ops-guide
...
intro to ops guide (#2387 )
2016-07-28 12:32:34 +01:00
Matthias Radestock
8056a098a8
remove dire warnings about 'eval' when using plugin
...
since as of #2330 the proxy ignores containers started with specified
user networks.
2016-07-28 11:49:54 +01:00
abuehrle
15a2cba7f8
added anchors to concepts
2016-07-28 11:49:06 +01:00
Anita Buehrle
b37bb02a8b
intro to ops guide ( #2387 )
2016-07-28 11:49:06 +01:00
Adam Harrison
0c14e5135a
Delint (spelling error)
2016-07-28 11:48:14 +01:00
Adam Harrison
f5a30c790e
Merge branch '1.6'
2016-07-28 11:30:47 +01:00
Adam Harrison
b06ddeb962
Merge pull request #2445 from weaveworks/fix-weave-ps
...
Fix "weave ps" output when weave is not running
2016-07-28 11:30:31 +01:00
Martynas Pumputis
34415c3c17
Merge pull request #2422 from weaveworks/log-resolvconf-errors
...
Log errors arising from reading resolv.conf
2016-07-26 18:01:33 +01:00
Matthias Radestock
6387fa8bc9
Merge branch '1.6'
2016-07-20 07:30:56 +01:00
Matthias Radestock
f6e6926171
cosmetic: fix wrapped quote
...
apparently our wp md renderer does not handle this correctly
2016-07-20 07:09:09 +01:00
Matthias Radestock
25e7868cd5
fix some indentation in docs block quote
2016-07-20 07:03:17 +01:00
Matthias Radestock
385e6ff9b8
Merge pull request #2446 from weaveworks/explicit-sudo-s
...
Make use of `sudo -s` more explicit
2016-07-20 06:45:50 +01:00
Matthias Radestock
3755906689
blockquote sudo-ing
2016-07-20 06:26:23 +01:00
Matthias Radestock
63cbb34dec
Make use of sudo -s more explicit
...
since people keep tripping over that.
Also
- add new error message spat out by recent dockers correct the socket
- URLs - they had fallen victim to a 'docker'->'Docker' replacement
- shorten the note on using the plugin
2016-07-20 06:26:03 +01:00
Adam Harrison
8ec6b699b1
Merge branch '1.6'
2016-07-18 11:48:08 +01:00
Adam Harrison
369852a3a7
Merge pull request #2430 from weaveworks/remove-duplicate-no-dns
...
remove duplication of `--no-dns`
2016-07-18 11:47:48 +01:00
Matthias Radestock
c82be57639
Merge pull request #2423 from philwinder/docs/cni-mesos
...
Refactor CNI documentation.
2016-07-18 09:58:00 +01:00
Phil Winder
092c3a17d1
Change title.
2016-07-18 09:22:24 +01:00
Martynas Pumputis
fd0a7efa23
Fix "weave ps" output when weave is not running
...
The #2418 has changed a behaviour of "weave ps" which outputs
"Link not found" in the case of weave not running. The previous
behaviour was to output an empty line.
2016-07-14 15:15:14 +01:00
Matthias Radestock
551f164ec3
Merge branch '1.6'
2016-07-12 20:47:23 +01:00
Matthias Radestock
acdd739deb
Merge branch 'fix-broken-link' into 1.6
2016-07-12 20:46:52 +01:00
Paul Bellamy
45e3016c6a
Fixing a broken link in docs
2016-07-12 20:44:57 +01:00
Bryan Boreham
88bf64722f
Merge branch '1.6'
2016-07-12 10:33:38 +00:00
Bryan Boreham
c1483dbf1f
Merge pull request #2418 from weaveworks/issues/2388-weave-ps
...
Fix "weave ps"; fixes #2388
2016-07-12 11:04:00 +01:00
Matthias Radestock
d9c998b5c4
Merge pull request #2386 from weaveworks/issues/354-multicast-isolation
...
Provide multicast isolation with in-container-netns iptables rules
Fixes #354 .
2016-07-12 09:46:14 +01:00
Adam Harrison
170e19c283
Merge branch '1.6'
2016-07-12 09:39:45 +01:00
Adam Harrison
bce07b7491
Merge pull request #2439 from weaveworks/restore-script-function-grouping
...
refactor: restore grouping of functions in script
2016-07-12 09:39:15 +01:00
Matthias Radestock
8b5741506d
refactor: restore grouping of functions in script
...
Recent(ish) changes placed functions in the wrong sections. Fix that
and label the sections more clearly.
2016-07-11 21:38:07 +01:00
Adam Harrison