Adam Harrison
bda245bfdb
Merge pull request #968 from rade/954_show_attach_expose_addresses
...
show IP addresses in attach/expose/detach/hide
2015-06-22 14:49:41 +01:00
Bryan Boreham
d1eb2917e8
Merge documentation from branch 1.0 into master
2015-06-22 14:32:12 +01:00
Bryan Boreham
9a631d0ecd
Merge documentation from branch 'latest_release_doc_updates' into 1.0
2015-06-22 14:25:56 +01:00
Bryan Boreham
c8032b6b25
Merge pull request #977 from bboreham/proxy-net-syntax
...
Change one IPAM proxy example to use a network
2015-06-22 14:24:24 +01:00
Bryan Boreham
68ca6ebe04
Change one IPAM proxy example to use the 'net:' syntax
2015-06-22 14:15:24 +01:00
Matthias Radestock
9f0cd93859
refactor(ish): get the more fundamental setup out of the way first
2015-06-22 12:50:50 +01:00
Matthias Radestock
7cf0d59003
update docs
2015-06-22 12:34:32 +01:00
Adam Harrison
74f8c07674
Merge documentation from branch '1.0'
2015-06-22 12:05:40 +01:00
Adam Harrison
1bbec56cc7
Merge documenation from branch 'latest_release_doc_updates' into 1.0
2015-06-22 12:02:35 +01:00
Adam Harrison
b86bae9c86
Fix incorrect address in service import/export examples
2015-06-22 12:00:57 +01:00
Paul Bellamy
6d89867a74
Merge pull request #978 from rade/972_remove_proxy_d_option
...
remove proxy -D option
2015-06-22 11:36:37 +01:00
Matthias Radestock
ebf725d869
add some tests
2015-06-22 11:26:33 +01:00
Matthias Radestock
257774a093
make weave attach|expose|detach|hide show IP addresses
...
The output contains one IP address for each addr (i.e. [ip:]<cidr> |
net:<cidr> | net:default) supplied on the command line; or, if none
was specified, a single address from the default IPAM subnet.
We don't want `weave run` to output the addresses, since it is meant
to (only) output the container id. Hence we redirect the `attach`
output to stderr in that case.
Closes #954 .
2015-06-22 11:26:33 +01:00
Matthias Radestock
6f798f723a
Merge remote-tracking branch 'upstream/1.0' into 1.0
2015-06-22 11:17:40 +01:00
Matthias Radestock
5fbda6b094
Merge remote-tracking branch 'upstream/master'
2015-06-22 11:15:58 +01:00
Matthias Radestock
b483be8c4b
remove the -D proxy option
...
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.
Fixes #972 .
2015-06-22 11:13:53 +01:00
Adam Harrison
a751237164
Merge documentation from branch '1.0'
2015-06-22 11:00:25 +01:00
Matthias Radestock
0c87dcd656
cosmetic
2015-06-22 11:00:12 +01:00
Adam Harrison
b1bd1d4d6a
Merge pull request #964 from awh/v1.0_use_proxy_doc_updates
...
Update documentation to leverage proxy
2015-06-22 10:46:00 +01:00
Matthias Radestock
e276f3e026
cosmetic
2015-06-22 10:38:59 +01:00
Adam Harrison
1e638be7ac
Remove weave run from how it works
2015-06-22 10:36:56 +01:00
Adam Harrison
acd2b9abeb
Reword proxy hyperlink text in index
2015-06-22 10:36:56 +01:00
Adam Harrison
6ddecfc764
Update proxy docs
2015-06-22 10:36:56 +01:00
Adam Harrison
f15ad71354
Update IPAM docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
4d54af39b0
Update weaveDNS docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
81d5a8f4f5
Update features docs to use proxy
2015-06-22 10:36:56 +01:00
Adam Harrison
344119f42a
Update README examples to use proxy
2015-06-22 10:36:52 +01:00
Matthias Radestock
84e5659090
Merge branch '1.0'
2015-06-22 10:31:50 +01:00
Matthias Radestock
514db8efdd
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-22 10:31:20 +01:00
Paul Bellamy
0693ec55c6
Merge pull request #974 from rade/972_remove_proxy_d_option_from_docs
...
remove the `-D` proxy option from the docs
2015-06-22 10:29:16 +01:00
Matthias Radestock
56c720b078
remove the -D proxy option from the docs
...
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.
Also remove dangling reference to 'localhost', and move note about
firwalls to where it is most pertinent.
Part fix to #972 .
2015-06-22 10:20:18 +01:00
Matthias Radestock
bbeb7966b4
Merge remote-tracking branch 'upstream/1.0'
2015-06-21 10:42:28 +01:00
Matthias Radestock
403b9654f1
Merge remote-tracking branch 'upstream/1.0' into latest_release_doc_updates
2015-06-21 10:41:38 +01:00
Matthias Radestock
84775e414b
Add release 1.0.1
2015-06-21 10:05:52 +01:00
Matthias Radestock
edb4911bf6
Merge branch '1.0'
2015-06-21 09:39:45 +01:00
Matthias Radestock
d913ca869c
Merge branch '967_include_image_name_in_inspect_error' into 1.0
2015-06-21 09:38:42 +01:00
Michael Bridgen
e3917121fa
Merge remote-tracking branch 'upstream/1.0.0'
2015-06-20 16:45:34 -07:00
Michael Bridgen
ede288ad38
Merge pull request #969 from rade/967_include_image_name_in_inspect_error
...
include image name in errors
2015-06-20 16:41:05 -07:00
Michael Bridgen
58f14551dc
Merge branch 'pr969'
2015-06-20 16:28:44 -07:00
Michael Bridgen
97816d6c54
Merge branch '967_include_image_name_in_inspect_error' of https://github.com/rade/weave into pr969
2015-06-20 16:21:20 -07:00
Matthias Radestock
3732f968d0
include image name in errors
...
The go docker client's ErrNoSuchImage does not include the image
name. However, it is imperative that this name appears in error
messages sent to clients, since the docker client, as of version
1.7.0, only automatically pulls images when their name is present in
the error.
Fixes #967 .
2015-06-20 23:36:48 +01:00
Matthias Radestock
939a095bf4
Merge pull request #966 from weaveworks/readme_website_sync
...
README update to point at weave.works
2015-06-19 20:38:37 +01:00
Fintan Ryan
ad0d53f7fe
Update proposed text
2015-06-19 19:17:43 +01:00
Fintan Ryan
e748ddc20d
README update to point at weave.works
2015-06-19 13:00:01 +01:00
Matthias Radestock
e51ecd73b3
refactor: extract helper
2015-06-18 19:01:10 +01:00
Matthias Radestock
5479d0a54d
improve test performance - only fetch status once per check
2015-06-18 18:53:06 +01:00
Matthias Radestock
6830b27317
cosmetic: correct some comments, tweak some arg parsing
2015-06-18 18:13:27 +01:00
Matthias Radestock
4399be7ad2
correct comments
2015-06-18 17:55:42 +01:00
Matthias Radestock
42d2a860eb
test more things, more obviously
2015-06-18 17:48:21 +01:00
Matthias Radestock
3ec0200067
cosmetic oops
2015-06-18 16:57:54 +01:00
Adam Harrison