add docker tproxy router example #1785
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
qrkourier
force-pushed
the
docker-router-example
branch
2 times, most recently
from
a1bd3ca
to
2bcbb70
Compare
qrkourier
commented
Mar 1, 2024
| @@ -40,8 +40,8 @@ link: | |||
| {{ if or .Router.IsFabric (eq .Router.TunnelerMode "none") }}#{{ end }} - binding: tunnel | |||
| {{ if or .Router.IsFabric (eq .Router.TunnelerMode "none") }}#{{ end }} options: | |||
| {{ if or .Router.IsFabric (eq .Router.TunnelerMode "none") }}# mode: host #tproxy|host{{ else }} mode: {{ .Router.TunnelerMode }} #tproxy|host{{ end }} | |||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} resolver: udp://{{ .Router.Edge.AdvertisedHost }}:53{{ end }} | |||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} lanIf: {{ .Router.Edge.LanInterface }}{{ end }} | |||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} resolver: udp://127.0.0.1:53{{ end }} | |||
There was a problem hiding this comment.
must be a locally-bound IP address or 0.0.0.0 (all IPv4, IPv6 interfaces)
| @@ -38,3 +38,7 @@ | |||
| - get: /zdew/ | |||
| raw: /openziti/desktop-edge-win/main/release-streams/ | |||
| file: latest.json | |||
|
|
|||
| - get: /dist/ | |||
There was a problem hiding this comment.
simplify the tproxy example by providing a short getter for the latest ziti-router compose file, and anything else in /dist/.
| @@ -40,8 +40,8 @@ link: | |||
| {{ if or .Router.IsFabric (eq .Router.TunnelerMode "none") }}#{{ end }} - binding: tunnel | |||
| {{ if or .Router.IsFabric (eq .Router.TunnelerMode "none") }}#{{ end }} options: | |||
| {{ if or .Router.IsFabric (eq .Router.TunnelerMode "none") }}# mode: host #tproxy|host{{ else }} mode: {{ .Router.TunnelerMode }} #tproxy|host{{ end }} | |||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} resolver: udp://{{ .Router.Edge.AdvertisedHost }}:53{{ end }} | |||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} lanIf: {{ .Router.Edge.LanInterface }}{{ end }} | |||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} resolver: udp://0.0.0.0:53{{ end }} | |||
There was a problem hiding this comment.
must be a local IP or 0.0.0.0
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} resolver: udp://{{ .Router.Edge.AdvertisedHost }}:53{{ end }} | ||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} lanIf: {{ .Router.Edge.LanInterface }}{{ end }} | ||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") }} resolver: udp://0.0.0.0:53{{ end }} | ||
| {{ if and (not .Router.IsFabric) (eq .Router.TunnelerMode "tproxy") (.Router.Edge.LanInterface) }} lanIf: {{ .Router.Edge.LanInterface }}{{ end }} |
There was a problem hiding this comment.
empty value is invalid router config, so only create the property if defined (solves #1780 )
qrkourier
added
the
quickstartrelease
qrkourier
force-pushed
the
docker-router-example
branch
from
a69f7ee
to
13c5a4e
Compare
qrkourier
force-pushed
the
docker-router-example
branch
from
9d0e0e2
to
124fe65
Compare
qrkourier
force-pushed
the
docker-router-example
branch
from
124fe65
to
5ca6a1e
Compare
qrkourier
force-pushed
the
docker-router-example
branch
from
5ca6a1e
to
a176355
Compare
qrkourier
changed the base branch from
linux-package-controller
to
linux-package-router
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.