From dd3d10fe27b0726dc458024b7041522dc712c079 Mon Sep 17 00:00:00 2001
From: Nikita Bizyaev <NBizyaev@alabuga.ru>
Date: Tue, 5 May 2026 11:13:21 +0300
Subject: [PATCH] the one server

---
 Dockerfile.dashboard      |  6 ------
 Dockerfile.netbird-server |  2 +-
 dashboard.env             |  6 ------
 docker-compose.yml        | 21 +++------------------
 4 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 Dockerfile.dashboard
 delete mode 100644 dashboard.env

diff --git a/Dockerfile.dashboard b/Dockerfile.dashboard
deleted file mode 100644
index 6e77558..0000000
--- a/Dockerfile.dashboard
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM netbirdio/dashboard:latest
-
-ENV NETBIRD_MGMT_API_ENDPOINT=https://birdy.greact.online
-ENV NETBIRD_MGMT_GRPC_API_ENDPOINT=https://birdy.greact.online
-ENV USE_AUTH0=false
-ENV NETBIRD_AUTH_OIDC_CONFIGURATION_ENDPOINT=
diff --git a/Dockerfile.netbird-server b/Dockerfile.netbird-server
index d96c819..87e5be7 100644
--- a/Dockerfile.netbird-server
+++ b/Dockerfile.netbird-server
@@ -1,3 +1,3 @@
-FROM netbirdio/netbird-server:latest
+FROM netbirdio/netbird:latest
 
 COPY config.yaml /etc/netbird/config.yaml
diff --git a/dashboard.env b/dashboard.env
deleted file mode 100644
index b876cd1..0000000
--- a/dashboard.env
+++ /dev/null
@@ -1,6 +0,0 @@
-NETBIRD_MGMT_API_ENDPOINT=https://birdy.greact.online
-NETBIRD_MGMT_GRPC_API_ENDPOINT=https://birdy.greact.online
-USE_AUTH0=false  # ВАЖНО: отключает Auth0
-
-# Эти переменные можно оставить пустыми (внешний IdP не используется):
-NETBIRD_AUTH_OIDC_CONFIGURATION_ENDPOINT=
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 38beeb0..0ef8af0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,10 @@
 services:
-  netbird-server:
+  birdy:
     build:
       context: .
       dockerfile: Dockerfile.netbird-server
-    image: birdy/netbird-server:local
-    container_name: netbird-server
+    image: birdy/netbird:local
+    container_name: birdy-server
     volumes:
       - netbird_data:/var/lib/netbird
     expose:
@@ -14,24 +14,9 @@ services:
     networks:
       - proxy
 
-  dashboard:
-    build:
-      context: .
-      dockerfile: Dockerfile.dashboard
-    image: birdy/netbird-dashboard:local
-    container_name: netbird-dashboard
-    expose:
-      - "80"
-    depends_on:
-      - netbird-server
-    restart: unless-stopped
-    networks:
-      - proxy
-
 volumes:
   netbird_data:
 
 networks:
   proxy:
     external: true
-    
\ No newline at end of file