diff --git a/infrastructure_files/getting-started.sh b/infrastructure_files/getting-started.sh index cf75901f1..7b600934c 100755 --- a/infrastructure_files/getting-started.sh +++ b/infrastructure_files/getting-started.sh @@ -300,7 +300,8 @@ initialize_default_values() { # Docker images CADDY_IMAGE="caddy" - DASHBOARD_IMAGE="netbirdio/dashboard:latest" + #DASHBOARD_IMAGE="netbirdio/dashboard:latest" + DASHBOARD_IMAGE="ghcr.io/netbirdio/dashboard-cloud:pr-271" SIGNAL_IMAGE="netbirdio/signal:latest" RELAY_IMAGE="netbirdio/relay:latest" MANAGEMENT_IMAGE="netbirdio/management:latest" @@ -319,7 +320,7 @@ initialize_default_values() { EXTERNAL_PROXY_NETWORK="" # Traefik TCP proxy configuration - TRAEFIK_IMAGE="traefik:v3.4" + TRAEFIK_IMAGE="traefik:v3.6" TRAEFIK_TCP_ACME_EMAIL="" # NetBird Proxy configuration @@ -384,7 +385,7 @@ check_existing_installation() { echo "Generated files already exist, if you want to reinitialize the environment, please remove them first." echo "You can use the following commands:" echo " $DOCKER_COMPOSE_COMMAND down --volumes # to remove all containers and volumes" - echo " rm -f docker-compose.yml Caddyfile dashboard.env management.json relay.env nginx-netbird.conf caddyfile-netbird.txt npm-advanced-config.txt traefik.yml traefik-dynamic.yml proxy.env" + echo " rm -f docker-compose.yml Caddyfile dashboard.env management.json relay.env nginx-netbird.conf caddyfile-netbird.txt npm-advanced-config.txt proxy.env" echo "Be aware that this will remove all data from the database, and you will have to reconfigure the dashboard." exit 1 fi @@ -420,8 +421,6 @@ generate_configuration_files() { ;; 6) render_docker_compose_traefik_tcp > docker-compose.yml - render_traefik_static_config > traefik.yml - render_traefik_dynamic_config > traefik-dynamic.yml if [[ "$ENABLE_PROXY" == "true" ]]; then # Create placeholder proxy.env so docker-compose can validate # This will be overwritten with the actual token after Management starts @@ -1279,6 +1278,7 @@ render_docker_compose_traefik_tcp() { # Generate proxy service section if enabled local proxy_service="" local proxy_volumes="" + local proxy_tcp_labels="" if [[ "$ENABLE_PROXY" == "true" ]]; then proxy_service=" # NetBird Proxy - exposes internal resources to the internet @@ -1300,6 +1300,15 @@ render_docker_compose_traefik_tcp() { - ./proxy.env volumes: - netbird_proxy_certs:/certs + labels: + # TCP passthrough for any unmatched domain (proxy handles its own TLS) + - traefik.enable=true + - traefik.tcp.routers.proxy-passthrough.entrypoints=websecure + - traefik.tcp.routers.proxy-passthrough.rule=HostSNI(\`*\`) + - traefik.tcp.routers.proxy-passthrough.tls.passthrough=true + - traefik.tcp.routers.proxy-passthrough.service=proxy-tls + - traefik.tcp.routers.proxy-passthrough.priority=1 + - traefik.tcp.services.proxy-tls.loadbalancer.server.port=8443 logging: driver: \"json-file\" options: @@ -1313,6 +1322,7 @@ render_docker_compose_traefik_tcp() { cat <