Export custom static folder

.github/workflows/release.yml

@@ -30,12 +30,12 @@ jobs:
           v: true
           x: false
           race: false
-          ldflags: -s -w -X github.com/naiba/nezha/service/singleton.Version=${{ steps.extract_branch.outputs.tag }}
+          ldflags: -s -w --extldflags '-static -fpic' -X github.com/naiba/nezha/service/singleton.Version=${{ steps.extract_branch.outputs.tag }}
           buildmode: default
 
       - name: fix dist
         run: |
-          cp dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
+          mv dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
 
       - name: Log in to the GHCR
         uses: docker/login-action@master

.github/workflows/test-on-pr.yml

@@ -17,10 +17,22 @@ jobs:
       - name: Unit test
         run: |
           go test -v ./...
-      - name: Build test
-        run: |
-          go build cmd/dashboard/main.go
       - name: Run Gosec Security Scanner
         uses: securego/gosec@master
         with:
           args: --exclude=G104,G402 ./...
+      - name: xgo build
+        uses: crazy-max/ghaction-xgo@v2
+        with:
+          xgo_version: latest
+          go_version: 1.21
+          dest: dist
+          pkg: cmd/dashboard
+          prefix: dashboard
+          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64 # linux/386,
+          v: true
+          x: false
+          race: false
+          ldflags: -s -w --extldflags '-static -fpic' -X github.com/naiba/nezha/service/singleton.Version=test
+          buildmode: default
+

.github/workflows/test.yml

@@ -26,10 +26,21 @@ jobs:
       - name: Unit test
         run: |
           go test -v ./...
-      - name: Build test
-        run: |
-          go build cmd/dashboard/main.go
       - name: Run Gosec Security Scanner
         uses: securego/gosec@master
         with:
           args: --exclude=G104,G402 ./...
+      - name: xgo build
+        uses: crazy-max/ghaction-xgo@v2
+        with:
+          xgo_version: latest
+          go_version: 1.21
+          dest: dist
+          pkg: cmd/dashboard
+          prefix: dashboard
+          targets: linux/amd64,linux/arm64,linux/arm-7,linux/s390x,linux/riscv64 # linux/386,
+          v: true
+          x: false
+          race: false
+          ldflags: -s -w --extldflags '-static -fpic' -X github.com/naiba/nezha/service/singleton.Version=test
+          buildmode: default

.gitignore

@@ -19,4 +19,4 @@
 /cmd/dashboard/main
 /config.yml
 /resource/template/theme-custom
-/resource/static/theme-custom
+/resource/static/custom

README.md

@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux">
+<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.</b></p>

cmd/dashboard/controller/controller.go

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"html/template"
 	"io/fs"
+	"log"
 	"net/http"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -16,7 +18,6 @@ import (
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 
 	"github.com/naiba/nezha/pkg/mygin"
-	"github.com/naiba/nezha/pkg/utils"
 	"github.com/naiba/nezha/resource"
 	"github.com/naiba/nezha/service/singleton"
 )
@@ -30,12 +31,7 @@ func ServeWeb(port uint) *http.Server {
 	if err != nil {
 		panic(err)
 	}
-	if utils.IsFileExists("resource/template") {
-		tmpl, err = tmpl.ParseGlob("resource/template/**/*.html")
-		if err != nil {
-			panic(err)
-		}
-	}
+	tmpl = loadThirdPartyTemplates(tmpl)
 	r.SetHTMLTemplate(tmpl)
 	if singleton.Conf.Debug {
 		gin.SetMode(gin.DebugMode)
@@ -47,6 +43,7 @@ func ServeWeb(port uint) *http.Server {
 		panic(err)
 	}
 	r.StaticFS("/static", http.FS(staticFs))
+	r.Static("/static-custom", "resource/static/custom")
 	routers(r)
 
 	page404 := func(c *gin.Context) {
@@ -87,6 +84,28 @@ func routers(r *gin.Engine) {
 	}
 }
 
+func loadThirdPartyTemplates(tmpl *template.Template) *template.Template {
+	var ret = tmpl
+	themes, err := os.ReadDir("resource/template")
+	if err != nil {
+		log.Printf("NEZHA>> Error reading themes folder: %v", err)
+		return ret
+	}
+	for _, theme := range themes {
+		if !theme.IsDir() {
+			continue
+		}
+		// load templates
+		t, err := ret.ParseGlob(fmt.Sprintf("resource/template/%s/*.html", theme.Name()))
+		if err != nil {
+			log.Printf("NEZHA>> Error parsing templates %s error: %v", theme.Name(), err)
+			continue
+		}
+		ret = t
+	}
+	return ret
+}
+
 var funcMap = template.FuncMap{
 	"tr": func(id string, dataAndCount ...interface{}) string {
 		conf := i18n.LocalizeConfig{

script/docker-compose.yaml

@@ -6,10 +6,9 @@ services:
     restart: always
     volumes:
       - ./data:/dashboard/data
+      - ./static-custom/static:/dashboard/resource/static/custom:ro
       - ./theme-custom/template:/dashboard/resource/template/theme-custom:ro
-      - ./theme-custom/static:/dashboard/resource/static/theme-custom:ro
       - ./dashboard-custom/template:/dashboard/resource/template/dashboard-custom:ro
-      - ./dashboard-custom/static:/dashboard/resource/static/dashboard-custom:ro
     ports:
       - nz_site_port:80
       - nz_grpc_port:nz_grpc_port