Skip to content

Use host-gateway to ensure servers can reach host #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DMRobertson merged 3 commits into from
Jun 14, 2022
Merged

Use host-gateway to ensure servers can reach host #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58f5bbe
Use `host-gateway` to ensure servers can reach host
Jun 6, 2022
9995a27
typo fix
Jun 7, 2022
b83b774
Note that Docker >= 20.10 is required.
Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Complement is a black box integration testing framework for Matrix homeservers.

## Running

You need to have Go and Docker installed, as well as `libolm3` and `libolm-dev`. Then:
You need to have Go and Docker >= 20.10 installed, as well as `libolm3` and `libolm-dev`. Then:

```
$ COMPLEMENT_BASE_IMAGE=some-matrix/homeserver-impl go test -v ./tests/...
Expand Down
9 changes: 5 additions & 4 deletions internal/docker/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,11 @@ func deployImage(
var err error

if runtime.GOOS == "linux" {
// By default docker for linux does not expose this, so do it now.
// When https://github.com/moby/moby/pull/40007 lands in Docker 20, we should
// change this to be `host.docker.internal:host-gateway`
extraHosts = []string{HostnameRunningComplement + ":172.17.0.1"}
// Ensure that the homeservers under test can contact the host, so they can
// interact with a complement-controlled test server.
// Note: this feature of docker landed in Docker 20.10,
// see https://github.com/moby/moby/pull/40007
extraHosts = []string{"host.docker.internal:host-gateway"}
}

for _, m := range cfg.HostMounts {
Expand Down