Merge pull request #1052 from crawlab-team/master

Merge back to develop

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,68 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, develop ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

backend/cmd/root.go

@@ -30,6 +30,7 @@ func Execute() error {
 
 func init() {
 	cobra.OnInitialize(initConfig)
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "c", "", "Use Custom Config File")
 }
 
 func initConfig() {

backend/go.mod.local

@@ -3,18 +3,16 @@ module crawlab
 go 1.16
 
 replace (
-    github.com/crawlab-team/crawlab-core => /libs/crawlab-team/crawlab-core
-    github.com/crawlab-team/crawlab-vcs => /libs/crawlab-team/crawlab-vcs
-    github.com/crawlab-team/crawlab-fs => /libs/crawlab-team/crawlab-fs
-    github.com/crawlab-team/crawlab-db => /libs/crawlab-team/crawlab-db
+    github.com/crawlab-team/crawlab-core => /Users/chenjingyang/dev/my-job/gitee/crawlab-core
+	github.com/crawlab-team/goseaweedfs => /Users/chenjingyang/dev/my-job/gitee/goseaweedfs
 )
 
 require (
-	github.com/apex/log v1.9.0
-	github.com/crawlab-team/crawlab-core v0.6.0-beta.20211219.2134
-	github.com/crawlab-team/go-trace v0.1.1
-	github.com/gin-gonic/gin v1.7.1
-	github.com/spf13/cobra v1.1.3
-	github.com/spf13/viper v1.7.1
-	go.uber.org/dig v1.10.0
+		github.com/apex/log v1.9.0
+    	github.com/crawlab-team/crawlab-core v0.6.0-beta.20211230.1200
+    	github.com/crawlab-team/go-trace v0.1.1
+    	github.com/gin-gonic/gin v1.7.1
+    	github.com/spf13/cobra v1.1.3
+    	github.com/spf13/viper v1.7.1
+    	go.uber.org/dig v1.10.0
 )

docker-compose.yml

@@ -12,15 +12,15 @@ services:
       - mongo
     # volumes:
     #   - "/var/crawlab/log:/var/logs/crawlab" # log persistent 日志持久化
-  #worker:
-  #  image: tikazyq/crawlab:latest
-  #  container_name: worker
-  #  environment:
-  #    CRAWLAB_SERVER_MASTER: "N"
-  #    CRAWLAB_MONGO_HOST: "mongo"
+  worker:
+    image: crawlabteam/crawlab:latest
+    container_name: worker
+    environment:
+      CRAWLAB_SERVER_MASTER: "N"
+      CRAWLAB_MONGO_HOST: "mongo"
   #    CRAWLAB_REDIS_ADDRESS: "redis"
-  #  depends_on:
-  #    - mongo
+    depends_on:
+      - mongo
     # volumes:
     #   - "/var/crawlab/log:/var/logs/crawlab" # log persistent 日志持久化
   mongo: