Matthias Radestock
beb15fa32c
don't fail weave launch when plugin is disabled
...
Fixes #1851 .
2016-01-04 10:35:44 +00:00
Matthias Radestock
0adf7626d0
Merge branch 'latest_release_doc_updates' into 1.4
2016-01-04 09:45:56 +00:00
Matthias Radestock
9c17fe259c
add ToC to build instructions
2016-01-04 09:41:39 +00:00
Matthias Radestock
ecab4b4716
correct image names
2016-01-04 09:35:17 +00:00
Matthias Radestock
7660ad761a
oops
...
I broke this in 370212609 .
Fixes #1848 .
2016-01-03 16:42:39 +00:00
Matthias Radestock
c8ff2de3b3
properly deal with unavailable docker server api version
...
Fixes #1845 .
2015-12-31 12:51:16 +00:00
Matthias Radestock
24a2e43547
Merge pull request #1841 from weaveworks/1840-weave-stop-plugin-complaint
...
don't complain in `weave stop` when plugin is not enabled
Fixes #1840 .
2015-12-31 12:32:05 +00:00
Matthias Radestock
a9d212c888
don't fail on missing docker_tls_args
...
instead just don't auto-detect TLS args in that case.
This makes `weave --local launch` work (again).
Fixes #1844 .
2015-12-31 10:43:46 +00:00
Matthias Radestock
c1b1276aaf
refactor: simplify
2015-12-31 10:16:37 +00:00
Matthias Radestock
370212609c
Show expected error message when docker_tls_args fails.
...
And also make the error message more meaningful.
Fixes #1843 .
2015-12-31 10:05:41 +00:00
Matthias Radestock
281937cf82
document weave launch-router --trusted-subnets
...
and eliminate duplication
Fixes #1842 .
2015-12-31 01:09:51 +00:00
Matthias Radestock
d11b6e8075
don't complain in weave stop when plugin is not enabled
2015-12-30 23:40:27 +00:00
Matthias Radestock
7709c6d0bd
Merge branch 'latest_release_doc_updates' into 1.4
2015-12-30 20:26:06 +00:00
Matthias Radestock
ef3e478506
Merge pull request #1804 from weaveworks/1774-trouble
...
Update 'reboots' info
Fixes #1774 .
2015-12-30 19:51:09 +00:00
Matthias Radestock
93eef26d0b
reword
2015-12-30 19:38:13 +00:00
Matthias Radestock
14d78cf08c
Update 'reboots' info
2015-12-30 19:32:18 +00:00
Matthias Radestock
e96a63f550
Merge branch 'latest_release_doc_updates' into 1.4
2015-12-30 19:14:33 +00:00
Matthias Radestock
7a5b69f850
cosmetic
2015-12-30 19:13:57 +00:00
Matthias Radestock
a71d2a1682
move things around on troubleshooting page
...
- level 2 headings for top-level instead of level 3
- put all status reporting as L3s under one L2 heading
- add 'Reboots' to ToC
- move 'Stopping weave' into its own section and and move that
2015-12-30 19:06:04 +00:00
Bryan Boreham
257b1a5353
Add the plugin to the list of images to tag and push
2015-12-23 11:00:58 +00:00
Bryan Boreham
b45ac75735
Merge pull request #1825 from weaveworks/1824-idempotent-env-restore
...
make `eval $(weave env)` idempotent; LGTM. Fixes #1824
2015-12-23 10:48:35 +00:00
Matthias Radestock
c7c669fd11
make eval $(weave env) idempotent
...
so that `weave $(env --restore)` does the right thing regardless of
how many times `eval $(weave env)` was invoked previously.
Fixes #1824 .
2015-12-23 09:08:56 +00:00
Bryan Boreham
ba266ef8d3
Add release v1.4.1
v1.4.1
2015-12-22 17:25:47 +00:00
Bryan Boreham
f434fad3be
Merge pull request #1822 from weaveworks/1820-unix-only
...
Only pass $DOCKER_HOST if it is a Unix socket - fixes #1820
2015-12-22 17:16:40 +00:00
Bryan Boreham
bab758ebf9
Revert "Launch the proxy via unix socket in last test"
...
- since we won't now be copying $DOCKER_HOST
This reverts commit d8cfbc4e08 .
2015-12-22 17:01:04 +00:00
Bryan Boreham
800f4663b6
Only pass through $DOCKER_HOST in exec_remote() if it is a Unix socket;
...
a TCP socket may be secured by TLS, in which case we can't use it.
2015-12-22 17:01:04 +00:00
Matthias Radestock
b1b62afa90
Merge pull request #1812 from weaveworks/1810-warn-with-dns
...
Issue a warning on --with-dns option to proxy, because it was removed
Fixes #1810
2015-12-22 15:12:27 +00:00
Bryan Boreham
6b90ef7078
Clarify message
2015-12-22 14:56:40 +00:00
Matthias Radestock
2ed4b45c24
Merge pull request #1817 from weaveworks/1815-docker-version
...
Check we have Docker 1.9 or newer before trying to remove a network
Fixes #1815 .
2015-12-22 14:01:55 +00:00
Matthias Radestock
47ba9748b4
Merge pull request #1814 from weaveworks/1778-check-running
...
Handle weave containers in 'restarting' state
Fixes #1778 .
2015-12-22 13:49:19 +00:00
Bryan Boreham
077ad4208f
Merge pull request #1813 from weaveworks/1797-plugin-version
...
Show plugin version; Fixes #1797
2015-12-22 13:12:38 +00:00
Bryan Boreham
c19edec364
Add 'weave stop-xxx' instructions for 'already running' case
2015-12-22 13:04:06 +00:00
Bryan Boreham
0c2aa494ae
Reduce duplication
2015-12-22 13:03:04 +00:00
Bryan Boreham
73e0a6bb0a
Inform user about weave containers in state 'restarting'
2015-12-22 13:01:00 +00:00
Bryan Boreham
abf1db0045
Merge pull request #1819 from weaveworks/1818-dont-launch-when-plugin-running
...
don't launch anything when plugin is running; fixes #1818 . LGTM.
2015-12-22 12:55:57 +00:00
Matthias Radestock
b40b78ece0
refactor docker_sock_volume_mount()
2015-12-22 12:47:36 +00:00
Matthias Radestock
3ade796e8d
don't launch anything when plugin is running
...
...just as we don't launch anything if either the router or proxy are
running.
Fixes #1818 .
2015-12-22 12:30:53 +00:00
Bryan Boreham
7c2e808924
Check we have Docker 1.9 or newer before trying to remove a network
2015-12-22 12:10:48 +00:00
Bryan Boreham
7d2227c5a4
Add plugin version to 'weave version'
2015-12-22 10:50:02 +00:00
Bryan Boreham
8a517d5c7c
Issue a warning on --with-dns option to proxy, because it was removed
2015-12-22 10:00:06 +00:00
Bryan Boreham
48658f011f
Merge pull request #1805 from weaveworks/script-indentation
...
Fix indentation of weave script
2015-12-18 09:53:12 +00:00
Bryan Boreham
4ebb13fa94
Fix indentation of netcheck if-statement
2015-12-17 16:23:42 +00:00
Adam Harrison
ff9a6b91a4
Merge branch 'latest_release_doc_updates' into 1.4
2015-12-17 13:07:48 +00:00
Adam Harrison
86fc37a968
Merge pull request #1799 from weaveworks/plugin-docs
...
Extend plugin docs
2015-12-17 12:24:12 +00:00
Bryan Boreham
37ae169323
Merge remote-tracking branch 'origin/master' into latest_release_doc_updates
2015-12-17 11:48:23 +00:00
Bryan Boreham
1ce0df4e94
Explain multiple networks
2015-12-17 11:42:41 +00:00
Bryan Boreham
db5ba61915
Improve formatting
2015-12-17 11:41:44 +00:00
Bryan Boreham
db120fb9be
Add release v1.4.0
v1.4.0
2015-12-17 10:30:06 +00:00
Adam Harrison
ea6e171a7f
Merge pull request #1794 from weaveworks/warn-stop-plugin
...
Warn user if weave network is in use on stop or reset of plugin
2015-12-17 10:27:58 +00:00
Bryan Boreham
246cb76e50
Add note to docs about not removing the plugin
2015-12-17 10:26:08 +00:00