Skip to content
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.

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

Add hybrid net support to goth #560

Merged
merged 10 commits into from
Nov 16, 2021
Merged

Add hybrid net support to goth #560

merged 10 commits into from
Nov 16, 2021

Conversation

maaktweluit
Copy link
Contributor

@maaktweluit maaktweluit commented Oct 27, 2021

  • Allow separate configuration of docker compose file
  • Add new env for hybrid net
  • Add docker compose for the new hybrid net setup

@maaktweluit maaktweluit self-assigned this Oct 27, 2021
@maaktweluit maaktweluit force-pushed the mwu/test-hybrid-net branch 3 times, most recently from 86e67fe to fee249c Compare October 29, 2021 11:57
@maaktweluit maaktweluit marked this pull request as ready for review November 15, 2021 16:41
Copy link
Contributor

@kmazurek kmazurek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Left one minor suggestion and one question :)

@@ -5,6 +5,7 @@

docker-compose:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Path to compose file to be used, relative to `docker-dir`

goth/address.py Outdated
@@ -67,7 +67,7 @@ def _with_default(self, mapping: Mapping[str, object]):

ROUTER_HOST = "router"
ROUTER_PORT = 7477
ROUTER_PROTOCOL = "tcp"
ROUTER_PROTOCOL = "udp"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this / should this be backward-compatible with ya-sb-router?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its not used :( we should remove those variables for now...

reverted the change to keep it backwards compatible and cleaner

@maaktweluit maaktweluit merged commit 29ec1d5 into master Nov 16, 2021
@maaktweluit maaktweluit deleted the mwu/test-hybrid-net branch November 16, 2021 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants