ci: ko build

.github/workflows/latest.workflow.yml

@@ -41,27 +41,13 @@ jobs:
           automatic_release_tag: latest
           files: |
             dist/*
-            
-  build-docker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
+      - name: Setup ko
+        uses: ko-build/[email protected]
+        env:
+          KO_DOCKER_REPO: docker.io/vaalacat/frp-panel
+      - env:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile.standalone
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: vaalacat/frp-panel:latest
+        run: |
+          echo "${password}" | ko login docker.io --username ${username} --password-stdin
+          ko build ./cmd/frpp --bare

.github/workflows/tag.workflow.yml

@@ -42,32 +42,14 @@ jobs:
           automatic_release_tag: ${{ steps.get_version.outputs.VERSION }}
           files: |
             dist/*
-
-  build-docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Get git tag history
-        run: git fetch -a
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
+      - name: Setup ko
+        uses: ko-build/[email protected]
+        env:
+          KO_DOCKER_REPO: docker.io/vaalacat/frp-panel
+      - name: Build image with ko
+        env:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile.standalone
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: vaalacat/frp-panel:${{ steps.get_version.outputs.VERSION }}
+        run: |
+          echo "${password}" | ko login docker.io --username ${username} --password-stdin
+          ko build ./cmd/frpp --bare -t ${{ steps.get_version.outputs.VERSION }}

.ko.yaml

@@ -0,0 +1,16 @@
+defaultBaseImage: alpine
+
+builds:
+- id: frpp
+  dir: .
+  main: ./cmd/frpp
+  ldflags:
+  - -s -w
+  - -X github.com/VaalaCat/frp-panel/conf.buildDate={{.Date}}
+  - -X github.com/VaalaCat/frp-panel/conf.gitCommit={{.Git.FullCommit}}
+  - -X github.com/VaalaCat/frp-panel/conf.gitVersion={{.Git.Tag}}
+  - -X github.com/VaalaCat/frp-panel/conf.gitBranch={{.Git.Branch}}
+
+defaultPlatforms:
+- linux/arm64
+- linux/amd64

build.sh

@@ -19,6 +19,7 @@ ARCH="all"
 BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
 GIT_COMMIT="$(git rev-parse HEAD)"
 VERSION="$(git describe --tags --abbrev=0 | tr -d '\n')"
+GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 
 # Parse arguments
 while [[ "$#" -gt 0 ]]; do
@@ -50,7 +51,7 @@ echo "Build Date: $BUILD_DATE"
 echo "Git Commit: $GIT_COMMIT"
 echo "Version: $VERSION"
 
-BUILD_LD_FLAGS="-X 'github.com/VaalaCat/frp-panel/conf.buildDate=${BUILD_DATE}' -X 'github.com/VaalaCat/frp-panel/conf.gitCommit=${GIT_COMMIT}' -X 'github.com/VaalaCat/frp-panel/conf.gitVersion=${VERSION}'"
+BUILD_LD_FLAGS="-X 'github.com/VaalaCat/frp-panel/conf.buildDate=${BUILD_DATE}' -X 'github.com/VaalaCat/frp-panel/conf.gitCommit=${GIT_COMMIT}' -X 'github.com/VaalaCat/frp-panel/conf.gitVersion=${VERSION}' -X 'github.com/VaalaCat/frp-panel/conf.gitBranch=${GIT_BRANCH}'"
 
 if [[ "$SKIP_FRONTEND" == "true" ]]; then
     echo "Skipping frontend build"

cmd/frpp/cmd.go

@@ -3,11 +3,13 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/VaalaCat/frp-panel/conf"
 	"github.com/VaalaCat/frp-panel/logger"
 	"github.com/VaalaCat/frp-panel/utils"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
@@ -140,6 +142,7 @@ func initCommand() {
 	rootCmd.AddCommand(clientCmd, serverCmd, masterCmd, versionCmd,
 		installServiceCmd, uninstallServiceCmd,
 		startServiceCmd, stopServiceCmd, restartServiceCmd)
+
 	clientCmd.Flags().StringVarP(&clientSecret, "secret", "s", "", "client secret")
 	serverCmd.Flags().StringVarP(&clientSecret, "secret", "s", "", "client secret")
 	clientCmd.Flags().StringVarP(&clientID, "id", "i", "", "client id")
@@ -191,3 +194,11 @@ func patchConfig(host, secret, clientID, clientSecret, apiScheme string, rpcPort
 		conf.Get().Master.APIHost, conf.Get().Master.APIPort,
 		conf.Get().Master.APIScheme)
 }
+
+func setMasterCommandIfNonePresent() {
+	cmd, _, err := rootCmd.Find(os.Args[1:])
+	if err == nil && cmd.Use == rootCmd.Use && cmd.Flags().Parse(os.Args[1:]) != pflag.ErrHelp {
+		args := append([]string{"master"}, os.Args[1:]...)
+		rootCmd.SetArgs(args)
+	}
+}

cmd/frpp/main.go

@@ -14,5 +14,6 @@ func main() {
 	conf.InitConfig()
 	rpc.InitRPCClients()
 
+	setMasterCommandIfNonePresent()
 	rootCmd.Execute()
 }

cmd/frpp/master.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"embed"
+	"path/filepath"
 
 	bizmaster "github.com/VaalaCat/frp-panel/biz/master"
 	"github.com/VaalaCat/frp-panel/biz/master/auth"
@@ -80,6 +81,12 @@ func initDatabase(c context.Context) {
 
 	switch conf.Get().DB.Type {
 	case "sqlite3":
+		if err := utils.EnsureDirectoryExists(conf.Get().DB.DSN); err != nil {
+			logrus.WithError(err).Warnf("ensure directory failed, data location: [%s], keep data in current directory", conf.Get().DB.DSN)
+			conf.Get().DB.DSN = filepath.Base(conf.Get().DB.DSN)
+			logrus.Infof("new data location: [%s]", conf.Get().DB.DSN)
+		}
+
 		if sqlitedb, err := gorm.Open(sqlite.Open(conf.Get().DB.DSN), &gorm.Config{}); err != nil {
 			logrus.Panic(err)
 		} else {

conf/settings.go

@@ -43,7 +43,7 @@ type Config struct {
 	} `env-prefix:"SERVER_"`
 	DB struct {
 		Type string `env:"TYPE" env-default:"sqlite3" env-description:"db type, mysql or sqlite3 and so on"`
-		DSN  string `env:"DSN" env-default:"data.db" env-description:"db dsn, for sqlite is path, other is dsn, look at https://github.com/go-sql-driver/mysql#dsn-data-source-name"`
+		DSN  string `env:"DSN" env-default:"/data/data.db" env-description:"db dsn, for sqlite is path, other is dsn, look at https://github.com/go-sql-driver/mysql#dsn-data-source-name"`
 	} `env-prefix:"DB_"`
 	Client struct {
 		ID     string `env:"ID" env-description:"client id"`

conf/version.go

@@ -12,12 +12,14 @@ import (
 var (
 	gitVersion = "dev-build"
 	gitCommit  = ""
+	gitBranch  = ""
 	buildDate  = "1970-01-01T00:00:00Z"
 )
 
 type VersionInfo struct {
 	GitVersion string `json:"gitVersion" yaml:"gitVersion"`
 	GitCommit  string `json:"gitCommit" yaml:"gitCommit"`
+	GitBranch  string `json:"gitBranch" yaml:"gitBranch"`
 	BuildDate  string `json:"buildDate" yaml:"buildDate"`
 	GoVersion  string `json:"goVersion" yaml:"goVersion"`
 	Compiler   string `json:"compiler" yaml:"compiler"`
@@ -42,6 +44,7 @@ func (v *VersionInfo) ToProto() *pb.ClientVersion {
 	return &pb.ClientVersion{
 		GitVersion: v.GitVersion,
 		GitCommit:  v.GitCommit,
+		GitBranch:  v.GitBranch,
 		BuildDate:  v.BuildDate,
 		GoVersion:  v.GoVersion,
 		Compiler:   v.Compiler,
@@ -53,6 +56,7 @@ func GetVersion() *VersionInfo {
 	return &VersionInfo{
 		GitVersion: gitVersion,
 		GitCommit:  gitCommit,
+		GitBranch:  gitBranch,
 		BuildDate:  buildDate,
 		GoVersion:  runtime.Version(),
 		Compiler:   runtime.Compiler,

idl/api_master.proto

@@ -27,6 +27,7 @@ message ClientVersion {
 	string GoVersion = 4;
 	string Compiler = 5;
 	string Platform = 6;
+  string GitBranch = 7;
 }
 
 message GetClientsStatusRequest {

utils/files.go

@@ -0,0 +1,18 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func EnsureDirectoryExists(filePath string) error {
+	directory := filepath.Dir(filePath)
+
+	if _, err := os.Stat(directory); os.IsNotExist(err) {
+		err = os.MkdirAll(directory, os.ModePerm)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}