From 852d6f41a9875b0f7978ff168985c5ecacbb2d63 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Mon, 15 Apr 2024 12:18:04 -0400 Subject: [PATCH] bootstrap router containers by default to enable docker run scenarios, i.e., Linux pax are opt-in to bootstrapping, Docker image is opt-out --- dist/docker-images/ziti-router/Dockerfile | 1 + dist/docker-images/ziti-router/compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/docker-images/ziti-router/Dockerfile b/dist/docker-images/ziti-router/Dockerfile index 75d90775f..8e09c95de 100644 --- a/dist/docker-images/ziti-router/Dockerfile +++ b/dist/docker-images/ziti-router/Dockerfile @@ -24,6 +24,7 @@ RUN INSTALL_PKGS="util-linux iptables libbpf iproute" && \ ENV ZITI_ROUTER_BOOTSTRAP_BASH=/bootstrap.bash ENV ZITI_ROUTER_TYPE=edge ENV ZITI_ROUTER_PORT=3022 +ENV ZITI_BOOTSTRAP=true ENV ZITI_BOOTSTRAP_CONFIG=true ENV ZITI_BOOTSTRAP_ENROLLMENT=true ENV PFXLOG_NO_JSON=true diff --git a/dist/docker-images/ziti-router/compose.yml b/dist/docker-images/ziti-router/compose.yml index 1af53d869..37adafab5 100644 --- a/dist/docker-images/ziti-router/compose.yml +++ b/dist/docker-images/ziti-router/compose.yml @@ -26,7 +26,7 @@ services: ZITI_CTRL_ADVERTISED_PORT: ${ZITI_CTRL_ADVERTISED_PORT:-1280} # exposed port of the controller ZITI_ENROLL_TOKEN: ${ZITI_ENROLL_TOKEN:-} # enrollment token for this router (required) ZITI_ROUTER_ADVERTISED_ADDRESS: ${ZITI_ROUTER_ADVERTISED_ADDRESS:-ziti-router} # domain name for this router (default: the container ID [hostname -f]) - ZITI_ROUTER_PORT: ${ZITI_ROUTER_PORT-3022} # exposed port for this router + ZITI_ROUTER_PORT: ${ZITI_ROUTER_PORT:-3022} # exposed port for this router ZITI_ROUTER_MODE: ${ZITI_ROUTER_MODE:-none} # none, host, tproxy, tproxy (default: none, tproxy requires additional config below) # *** less relevant vars below ***