From 619f12a2d298f2d88a3cffcddcf4167803b293eb Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 30 Aug 2023 17:58:58 -0400 Subject: [PATCH 1/2] continue forwarding ports from 0.0.0.0 by default and allow overriding the interface address, e.g., 127.0.21.71 --- quickstart/docker/.env | 2 ++ quickstart/docker/simplified-docker-compose.yml | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/quickstart/docker/.env b/quickstart/docker/.env index fab7f04a2..da4ebbea1 100644 --- a/quickstart/docker/.env +++ b/quickstart/docker/.env @@ -7,6 +7,8 @@ ZITI_VERSION=latest ZITI_USER=admin ZITI_PWD= +ZITI_INTERFACE=0.0.0.0 +# ZITI_GO_VERSION= # controller name, address/port information ZITI_CTRL_NAME=ziti-controller ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=ziti-edge-controller diff --git a/quickstart/docker/simplified-docker-compose.yml b/quickstart/docker/simplified-docker-compose.yml index b0a101e3b..a4399cda5 100644 --- a/quickstart/docker/simplified-docker-compose.yml +++ b/quickstart/docker/simplified-docker-compose.yml @@ -1,12 +1,11 @@ -version: '2.4' services: ziti-controller: image: "${ZITI_IMAGE}:${ZITI_VERSION}" env_file: - ./.env ports: - - ${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} - - ${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} environment: - ZITI_CTRL_NAME=${ZITI_CTRL_NAME:-ziti-edge-controller} - ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS:-ziti-edge-controller} @@ -51,8 +50,8 @@ services: depends_on: - ziti-controller ports: - - ${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} - - ${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} environment: - ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-ziti-controller} - ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-6262} @@ -83,7 +82,7 @@ services: depends_on: - ziti-controller ports: - - 8443:8443 + - ${ZITI_INTERFACE:-0.0.0.0}:8443:8443 volumes: - ziti-fs:/persistent networks: From 0a9b5bb46fc80c559e599986bffb1547b7d85ab4 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Thu, 31 Aug 2023 10:19:57 -0400 Subject: [PATCH 2/2] make the complicated compose file's port forward interface configurable --- quickstart/docker/docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml index 200fc3457..e1071188b 100644 --- a/quickstart/docker/docker-compose.yml +++ b/quickstart/docker/docker-compose.yml @@ -5,8 +5,8 @@ services: env_file: - ./.env ports: - - ${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} - - ${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} environment: - ZITI_CTRL_NAME=${ZITI_CTRL_NAME:-ziti-edge-controller} - ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS:-ziti-edge-controller} @@ -59,8 +59,8 @@ services: depends_on: - ziti-controller ports: - - ${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} - - ${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} environment: - ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-ziti-controller} - ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-6262} @@ -86,8 +86,8 @@ services: depends_on: - ziti-controller ports: - - ${ZITI_ROUTER_WSS_PORT:-3023}:${ZITI_ROUTER_WSS_PORT:-3023} - - ${ZITI_ROUTER_LISTENER_BIND_PORT:-10081}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10081} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_WSS_PORT:-3023}:${ZITI_ROUTER_WSS_PORT:-3023} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10081}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10081} environment: - ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-ziti-controller} - ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-6262} @@ -175,7 +175,7 @@ services: web-test-blue: image: crccheck/hello-world ports: - - 80:8000 + - ${ZITI_INTERFACE:-0.0.0.0}:80:8000 networks: zitiblue: aliases: @@ -196,7 +196,7 @@ services: depends_on: - ziti-controller ports: - - 8443:8443 + - ${ZITI_INTERFACE:-0.0.0.0}:8443:8443 volumes: - ziti-fs:/persistent networks: