mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-08 00:26:37 +08:00
[优化] 更新 Docker 镜像名称并调整日志级别配置
This commit is contained in:
@@ -46,7 +46,7 @@ jobs:
|
|||||||
POINTED_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -n1)"
|
POINTED_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -n1)"
|
||||||
INPUT_VERSION="${INPUT_VERSION//[[:space:]]/}"
|
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
|
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
||||||
VERSION="${GITHUB_REF_NAME}"
|
VERSION="${GITHUB_REF_NAME}"
|
||||||
elif [[ -n "$INPUT_VERSION" ]]; then
|
elif [[ -n "$INPUT_VERSION" ]]; then
|
||||||
@@ -126,7 +126,7 @@ jobs:
|
|||||||
POINTED_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -n1)"
|
POINTED_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -n1)"
|
||||||
INPUT_VERSION="${INPUT_VERSION//[[:space:]]/}"
|
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
|
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
||||||
VERSION="${GITHUB_REF_NAME}"
|
VERSION="${GITHUB_REF_NAME}"
|
||||||
elif [[ -n "$INPUT_VERSION" ]]; then
|
elif [[ -n "$INPUT_VERSION" ]]; then
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"openflare-relay/internal/config"
|
"openflare-relay/internal/config"
|
||||||
@@ -20,7 +21,7 @@ import (
|
|||||||
func main() {
|
func main() {
|
||||||
// Setup simple structured logging
|
// Setup simple structured logging
|
||||||
slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
|
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")
|
configPath := flag.String("config", "./relay.json", "relay config path")
|
||||||
@@ -71,3 +72,16 @@ func main() {
|
|||||||
}
|
}
|
||||||
slog.Info("relay process stopped")
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -285,12 +285,12 @@ export function buildTunnelDockerInstallCommand(
|
|||||||
serverUrl: string,
|
serverUrl: string,
|
||||||
tunnelToken: string,
|
tunnelToken: string,
|
||||||
) {
|
) {
|
||||||
const image = 'ghcr.io/rain-kl/openflare-flared:latest';
|
const image = 'ghcr.io/rain-kl/openflared:latest';
|
||||||
|
|
||||||
return [
|
return [
|
||||||
`docker pull ${image}`,
|
`docker pull ${image}`,
|
||||||
`docker rm -f openflare-flared 2>/dev/null || true`,
|
`docker rm -f openflared 2>/dev/null || true`,
|
||||||
`docker run -d --name openflare-flared --restart unless-stopped \\`,
|
`docker run -d --name openflared --restart unless-stopped \\`,
|
||||||
` -e OPENFLARE_SERVER_URL=${serverUrl} \\`,
|
` -e OPENFLARE_SERVER_URL=${serverUrl} \\`,
|
||||||
` -e OPENFLARE_TUNNEL_TOKEN=${tunnelToken} \\`,
|
` -e OPENFLARE_TUNNEL_TOKEN=${tunnelToken} \\`,
|
||||||
` ${image}`,
|
` ${image}`,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"openflare-flared/internal/config"
|
"openflare-flared/internal/config"
|
||||||
@@ -20,7 +21,7 @@ import (
|
|||||||
func main() {
|
func main() {
|
||||||
// Setup simple structured logging
|
// Setup simple structured logging
|
||||||
slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
|
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")
|
configPath := flag.String("config", "./flared.json", "flared config path")
|
||||||
@@ -71,3 +72,16 @@ func main() {
|
|||||||
}
|
}
|
||||||
slog.Info("flared process stopped")
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user