From cc50cc695ef78a3cfbdef6e43e520726c785f202 Mon Sep 17 00:00:00 2001
From: ryan <ryan@arctel.net>
Date: Mon, 1 Jun 2026 21:35:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E6=9B=B4=E6=96=B0=20Doc?=
 =?UTF-8?q?ker=20=E9=95=9C=E5=83=8F=E5=90=8D=E7=A7=B0=E5=B9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-openflared.yml      |  4 ++--
 openflare_relay/cmd/relay/main.go            | 16 +++++++++++++++-
 openflare_server/web/features/nodes/utils.ts |  6 +++---
 openflared/cmd/flared/main.go                | 16 +++++++++++++++-
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-openflared.yml b/.github/workflows/docker-openflared.yml
index 5dfd2bfd..f4222fd5 100644
--- a/.github/workflows/docker-openflared.yml
+++ b/.github/workflows/docker-openflared.yml
@@ -46,7 +46,7 @@ jobs:
           POINTED_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -n1)"
           INPUT_VERSION="${INPUT_VERSION//[[:space:]]/}"
 
-          echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY,,}-flared" >> "$GITHUB_ENV"
+          echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/openflared" >> "$GITHUB_ENV"
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
             VERSION="${GITHUB_REF_NAME}"
           elif [[ -n "$INPUT_VERSION" ]]; then
@@ -126,7 +126,7 @@ jobs:
           POINTED_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -n1)"
           INPUT_VERSION="${INPUT_VERSION//[[:space:]]/}"
 
-          echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY,,}-flared" >> "$GITHUB_ENV"
+          echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/openflared" >> "$GITHUB_ENV"
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
             VERSION="${GITHUB_REF_NAME}"
           elif [[ -n "$INPUT_VERSION" ]]; then
diff --git a/openflare_relay/cmd/relay/main.go b/openflare_relay/cmd/relay/main.go
index 2fcce189..6b88aac7 100644
--- a/openflare_relay/cmd/relay/main.go
+++ b/openflare_relay/cmd/relay/main.go
@@ -6,6 +6,7 @@ import (
 	"log/slog"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 
 	"openflare-relay/internal/config"
@@ -20,7 +21,7 @@ import (
 func main() {
 	// Setup simple structured logging
 	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
-		Level: slog.LevelDebug,
+		Level: parseLevel(os.Getenv("LOG_LEVEL")),
 	})))
 
 	configPath := flag.String("config", "./relay.json", "relay config path")
@@ -71,3 +72,16 @@ func main() {
 	}
 	slog.Info("relay process stopped")
 }
+
+func parseLevel(value string) slog.Level {
+	switch strings.ToLower(strings.TrimSpace(value)) {
+	case "debug":
+		return slog.LevelDebug
+	case "warn", "warning":
+		return slog.LevelWarn
+	case "error":
+		return slog.LevelError
+	default:
+		return slog.LevelInfo
+	}
+}
diff --git a/openflare_server/web/features/nodes/utils.ts b/openflare_server/web/features/nodes/utils.ts
index 4977c112..e1743546 100644
--- a/openflare_server/web/features/nodes/utils.ts
+++ b/openflare_server/web/features/nodes/utils.ts
@@ -285,12 +285,12 @@ export function buildTunnelDockerInstallCommand(
   serverUrl: string,
   tunnelToken: string,
 ) {
-  const image = 'ghcr.io/rain-kl/openflare-flared:latest';
+  const image = 'ghcr.io/rain-kl/openflared:latest';
 
   return [
     `docker pull ${image}`,
-    `docker rm -f openflare-flared 2>/dev/null || true`,
-    `docker run -d --name openflare-flared --restart unless-stopped \\`,
+    `docker rm -f openflared 2>/dev/null || true`,
+    `docker run -d --name openflared --restart unless-stopped \\`,
     `  -e OPENFLARE_SERVER_URL=${serverUrl} \\`,
     `  -e OPENFLARE_TUNNEL_TOKEN=${tunnelToken} \\`,
     `  ${image}`,
diff --git a/openflared/cmd/flared/main.go b/openflared/cmd/flared/main.go
index 7b277d9c..2c3043e5 100644
--- a/openflared/cmd/flared/main.go
+++ b/openflared/cmd/flared/main.go
@@ -6,6 +6,7 @@ import (
 	"log/slog"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 
 	"openflare-flared/internal/config"
@@ -20,7 +21,7 @@ import (
 func main() {
 	// Setup simple structured logging
 	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
-		Level: slog.LevelDebug,
+		Level: parseLevel(os.Getenv("LOG_LEVEL")),
 	})))
 
 	configPath := flag.String("config", "./flared.json", "flared config path")
@@ -71,3 +72,16 @@ func main() {
 	}
 	slog.Info("flared process stopped")
 }
+
+func parseLevel(value string) slog.Level {
+	switch strings.ToLower(strings.TrimSpace(value)) {
+	case "debug":
+		return slog.LevelDebug
+	case "warn", "warning":
+		return slog.LevelWarn
+	case "error":
+		return slog.LevelError
+	default:
+		return slog.LevelInfo
+	}
+}