Merge branch 'master' of ssh://git.infini.ltd:64221/infini/search-center

Jenkinsfile

@@ -20,10 +20,10 @@ pipeline {
                     steps {
                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){
                             sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean config build-linux build-arm'
-                            sh "cd /home/deploy/search-center/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \
+                            sh "cd /home/jenkins/go/src/infini.sh/search-center/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \
-                                            cd /home/deploy/search-center/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh"
+                                            cd /home/jenkins/go/src/infini.sh/search-center/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh"
-                            sh 'cd /home/deploy/search-center && cnpm install'
+                            sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install'
-                            sh 'cd /home/deploy/search-center/web && cnpm run build'
+                            sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm run build'
                             sh label: 'package-linux-amd64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-amd64.tar.gz console-linux-amd64 console.yml '
                             sh label: 'package-linux-386', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-386.tar.gz console-linux-386 console.yml '
                             sh label: 'package-linux-mips', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips.tar.gz console-linux-mips console.yml '
@@ -42,3 +42,5 @@ pipeline {
 
     }
 }
+
+}

Jenkinsfile-docker

@@ -0,0 +1,30 @@
+pipeline {
+
+    agent none
+
+    environment { 
+        CI = 'true'
+    }
+    stages {
+
+       stage('build') {
+
+        parallel {
+
+        stage('Build Docker Images') {
+
+                    agent {
+                        label 'linux'
+                    }
+
+                    steps {
+                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){
+                            sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/ && docker build -t infini-console  -f search-center/docker/Dockerfile .'
+                            sh label: 'docker-tagging', script: 'docker tag infini-console infinilabs/console:latest && docker tag infini-console infinilabs/console:$VERSION-$BUILD_NUMBER'
+                            sh label: 'docker-push', script: 'docker push infinilabs/console:$VERSION-$BUILD_NUMBER && docker push infinilabs/console:latest'
+                        }
+                    }
+                }
+    } }
+    }
+}

web/src/locales/en-US.js

@@ -5,10 +5,10 @@ import cluster from "./en-US/cluster";
 export default {
   "navBar.lang": "Languages",
 
-  "layout.user.appname": "INFINI SEARCH CENTER",
+  "layout.user.appname": "INFINI DATA CENTER",
   "layout.user.appslogon":
-    "INFINI search center is the best search platform in the world",
+    "INFINI data center is the best search platform in the world",
-  "app.setting.appname": "Search Center",
+  "app.setting.appname": "INFINI Console",
 
   "layout.user.link.help": "Help",
   "layout.user.link.privacy": "Privacy",
@@ -157,7 +157,7 @@ export default {
   "menu.system.logs.audit": "AUDIT",
   "menu.system.logs.query": "QUERY",
   "menu.system.logs.slow": "SLOW",
-  "menu.system.commonCommand": "COMMON COMMAND",
+  "menu.system.commonCommand": "COMMANDS",
 
   "menu.form": "Form",
   "menu.form.basicform": "Basic Form",

web/src/locales/zh-CN.js

@@ -5,9 +5,9 @@ import cluster from "./zh-CN/cluster";
 export default {
   "navBar.lang": "语言",
 
-  "layout.user.appname": "极限搜索管理后台",
+  "layout.user.appname": "极限数据管理后台",
-  "layout.user.appslogon": "极限科技的搜索平台是东半球最好用的搜索服务平台",
+  "layout.user.appslogon": "极限科技的数据管理平台是东半球最好用的实时数据管理平台",
-  "app.setting.appname": "极限搜索中心",
+  "app.setting.appname": "极限数据中心",
 
   "layout.user.link.help": "帮助",
   "layout.user.link.privacy": "隐私",