Paul Bellamy
32a12578f3
Don't use go-dockerclient to en/decode inspects in the proxy
2015-09-04 13:40:07 +01:00
Paul Bellamy
11b655154c
"Clarifying" proxy --rewrite-inspect documentation
2015-09-04 13:40:07 +01:00
Paul Bellamy
19ceb424c3
[proxy] refactoring out common marshalling logic
2015-09-04 13:40:07 +01:00
Paul Bellamy
e21a204eed
[proxy] add --rewrite-inspect flag
...
To return the weave ip/mac for docker inspect calls.
2015-09-04 13:40:06 +01:00
Bryan Boreham
145a527626
Merge pull request #1379 from awh/issues/1369-weave-dns-add-remove-optional-ip
...
LGTM. Fixes #1369
2015-09-04 12:13:38 +01:00
Paul Bellamy
b33bbdb3f8
Merge commit '704e6a8'
2015-09-04 10:41:27 +01:00
Paul Bellamy
704e6a8676
errcheck says I should handle this case
2015-09-04 10:40:47 +01:00
Matthias Radestock
4c6a8f29c0
Merge pull request #1372 from weaveworks/issues/880-draft-releases
...
Support draft and pre-releases in `bin/release`
Fixes #880 . Fixes #909 .
2015-09-03 15:54:07 +01:00
Adam Harrison
5744ed8994
Document release process
2015-09-03 13:01:29 +01:00
Matthias Radestock
c71d9b126f
Merge pull request #1380 from weaveworks/598-update-docs
...
Update docs for mixed manual and automatic IP allocation
Missed from #1200 .
2015-09-03 12:27:24 +01:00
Bryan Boreham
5b437d2199
Update docs for mixed manual and automatic IP allocation
2015-09-03 12:17:31 +01:00
Adam Harrison
0125e67b35
Implement smoke test
2015-09-03 09:59:37 +01:00
Adam Harrison
1472e35011
Update documentation
2015-09-03 09:59:37 +01:00
Adam Harrison
58ea422ea2
Optional address argument to dns-add/dns-remove
2015-09-02 17:10:48 +01:00
Adam Harrison
3097565664
Merge branch '1.0'
...
Conflicts:
site/weavedns.md
2015-09-02 17:09:39 +01:00
Adam Harrison
81134b408d
Merge branch 'latest_release_doc_updates' into 1.0
2015-09-02 17:07:48 +01:00
Adam Harrison
26fdd5da03
Remove misplaced sentence
2015-09-02 17:06:23 +01:00
Adam Harrison
6a5df80bda
Fix latest_release hash test
...
Obtain the version and latest_release tag commit hashes before changing
into the cloned repository so that all tagging and pushing happens on
the outer repository.
2015-09-02 14:13:11 +01:00
Adam Harrison
b13baccbd2
Introduce draft step
...
The publish stage has been split into two pieces - a draft step that
creates a draft version release in Github and a publish step that
publishes the draft, updates `latest_release` and pushes images to
DockerHub.
It is also possible to specify `--pre-release` to draft. Once published
such a release will be marked with a prominent warning in GitHub;
additionally we do not update `latest_release` in GitHub nor push an
update to the `latest` tag in DockerHub.
2015-09-01 17:04:11 +01:00
Adam Harrison
82f2f7b2b9
Check for required tooling at top level
...
Pull common checks out to top level in preparation for the introduction
of an additional process step.
2015-09-01 17:04:11 +01:00
Adam Harrison
f48a4373d1
Allow freeform version tags
...
To support arbitrarily named pre-releases we no longer impose any
restrictions on the format of the most recent annotated tag - instead we
expect to find a single annotated tag pointing at HEAD of the current
branch and assume this is the version to release.
2015-09-01 17:04:11 +01:00
Adam Harrison
ab9d1777a1
Support make UPDATE_LATEST=false publish
...
When publishing pre-releases via the release script we do not want to
modify the `latest` tag in DockerHub - specifying UPDATE_LATEST=false
causes publish to push to $WEAVE_VERSION only. Omitting the flag
entirely retains the existing behaviour for backwards compatability.
2015-09-01 17:04:11 +01:00
Bryan Boreham
6a34995796
Merge pull request #1370 from weaveworks/docker-py-test-matcher
...
LGTM. Fixes #1367
2015-09-01 16:47:24 +01:00
Bryan Boreham
df25f84011
Merge pull request #1375 from weaveworks/1373-document-no-rewrite-hosts
...
LGTM. Fixes #1373
2015-09-01 15:01:51 +01:00
Paul Bellamy
cead9579be
document --no-rewrite-hosts flag
2015-09-01 11:01:45 +01:00
Paul Bellamy
a23c0237c3
using --collect-only so we don't miss tests
2015-09-01 10:50:13 +01:00
Matthias Radestock
5c3efbdca0
Merge pull request #1366 from weaveworks/python-call-changed
...
Fix docker api proxy smoke-tests after docker-py change
2015-08-28 20:50:35 +01:00
Bryan Boreham
176ee73efe
Ensure we have the busybox image
2015-08-28 20:34:43 +01:00
Bryan Boreham
54833195ed
Call to docker-py changed upstream
2015-08-28 20:34:43 +01:00
Matthias Radestock
8960a3a898
Merge branch '1.0'
...
Conflicts:
proxy/create_exec_interceptor.go
test/600_proxy_docker_py_test.sh
2015-08-28 20:29:43 +01:00
Matthias Radestock
8184d29d4a
Merge pull request #1367 from weaveworks/1.0-python-call-changed
...
Fix docker api proxy smoke-tests after docker-py change
2015-08-28 20:22:22 +01:00
Matthias Radestock
fef91b5339
comment
2015-08-28 18:09:23 +01:00
Matthias Radestock
24de98e188
refactor
2015-08-28 18:08:24 +01:00
Matthias Radestock
6291a89665
Merge pull request #1314 from weaveworks/1209-wait-iface-netlink
...
Wait for ethwe via netlink, not via polling or signals
Fixes #1209 . Fixes #1258 . Fixes #1300 .
2015-08-28 17:44:55 +01:00
Bryan Boreham
a45e5ac152
Test calling 'start' with a HOST_CONFIG not supplied to 'create'
2015-08-28 16:20:31 +01:00
Paul Bellamy
6b5f35e574
[proxy] Only replace the request body if we've modified it.
...
This is a temporary fix for a failure in docker-py tests:
"test_valid_no_config_specified".
2015-08-28 15:09:33 +01:00
Matthias Radestock
244a679f90
Merge pull request #1349 from weaveworks/issues/1266-detect-adverse-firewall-config
...
Warn on detection of REJECT rule in FORWARD chain
Fixes #1266 .
2015-08-28 12:22:23 +01:00
Matthias Radestock
1a9909e3e2
also warn on weave reset when env's DOCKER_HOST points to proxy
...
This was missed in #1327 .
2015-08-28 09:34:18 +01:00
Matthias Radestock
6655974ef3
cosmetic: tidy up log messages
2015-08-28 09:12:42 +01:00
Matthias Radestock
cdf4fb605a
Merge branch '1.0'
2015-08-27 20:04:04 +01:00
Michael Bridgen
bca31c7335
Merge pull request #1365 from weaveworks/1356_ignore_interface_deletion_errors_in_weave_reset
...
ignore interface deletion errors during `weave reset`
2015-08-27 15:38:16 +01:00
Bryan Boreham
7652b44c21
Ensure we have the busybox image
2015-08-27 15:14:06 +01:00
Bryan Boreham
6fce798164
Factor out deserializeRoute() func
2015-08-27 15:10:31 +01:00
Bryan Boreham
7801dcd849
Factor out common loop receiving from netlink
2015-08-27 15:10:31 +01:00
Bryan Boreham
2eed101a93
In weavewait, wait for the multicast route to be added before calling container entrypoint.
...
We have moved the 'route add' command to the end of 'attach', so this
indicates that all network interface set-up is complete.
2015-08-27 15:10:31 +01:00
Bryan Boreham
3d25620d13
In proxy, rewrite /etc/hosts from 'weave attach', via new utility weavehosts
2015-08-27 15:03:41 +01:00
Bryan Boreham
6e89b036e2
Wait for ethwe via netlink, not via polling or signals
...
('docker kill' breaks restart policy)
2015-08-27 15:03:41 +01:00
Michael Bridgen
8b5992e43f
Merge pull request #1290 from weaveworks/labels
...
Add role label to weave containers so scope can filter
2015-08-27 15:00:15 +01:00
Bryan Boreham
548b4aea40
Call to docker-py changed upstream
2015-08-27 14:54:20 +01:00
Tom Wilkie
42b64f826b
Merge pull request #1358 from weaveworks/1357-dns-reverse-tombstone
...
Make reverse dns lookups honor tombstones.
2015-08-27 14:25:23 +01:00