diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c13f2ee..e9238c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: - 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 diff --git a/.gitignore b/.gitignore index 6a33293..41e59cc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ /cmd/dashboard/main /config.yml /resource/template/theme-custom -/resource/static/theme-custom +/resource/static/custom diff --git a/cmd/dashboard/controller/controller.go b/cmd/dashboard/controller/controller.go index 11f99c4..ece1d56 100644 --- a/cmd/dashboard/controller/controller.go +++ b/cmd/dashboard/controller/controller.go @@ -43,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) { diff --git a/script/docker-compose.yaml b/script/docker-compose.yaml index 31c8f7c..80de003 100644 --- a/script/docker-compose.yaml +++ b/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