From ae151c185cddd41faa8971e630136a3b4c76b1ef Mon Sep 17 00:00:00 2001 From: medcl Date: Mon, 22 Nov 2021 15:02:54 +0800 Subject: [PATCH 1/4] add jenkins file --- Jenkinsfile-docker | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Jenkinsfile-docker diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker new file mode 100644 index 00000000..860d77bf --- /dev/null +++ b/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' + } + } + } + } } + } +} From 2200a6f5a01fda0a48ff82f6133adefd08fb650c Mon Sep 17 00:00:00 2001 From: medcl Date: Mon, 22 Nov 2021 15:06:12 +0800 Subject: [PATCH 2/4] fix jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8cedcd2f..0f3500b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,3 +42,5 @@ pipeline { } } + +} From 153469a2751794aed7fe4c75326bdaa0e3725021 Mon Sep 17 00:00:00 2001 From: medcl Date: Mon, 22 Nov 2021 15:33:08 +0800 Subject: [PATCH 3/4] update jenkins file --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0f3500b8..0555cfe1 100644 --- a/Jenkinsfile +++ b/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 && \ - cd /home/deploy/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/deploy/search-center/web && cnpm run build' + 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/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/jenkins/go/src/infini.sh/search-center && cnpm install' + 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 ' From 5582ff6cc7a6b7e0e98ce24e680bb7087082882d Mon Sep 17 00:00:00 2001 From: medcl Date: Mon, 22 Nov 2021 16:24:14 +0800 Subject: [PATCH 4/4] update locals --- web/src/locales/en-US.js | 8 ++++---- web/src/locales/zh-CN.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js index 8ac7be45..3a13cdcb 100644 --- a/web/src/locales/en-US.js +++ b/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", - "app.setting.appname": "Search Center", + "INFINI data center is the best search platform in the world", + "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", diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js index 1c87bd69..52eff973 100644 --- a/web/src/locales/zh-CN.js +++ b/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.appslogon": "极限科技的搜索平台是东半球最好用的搜索服务平台", - "app.setting.appname": "极限搜索中心", + "layout.user.appname": "极限数据管理后台", + "layout.user.appslogon": "极限科技的数据管理平台是东半球最好用的实时数据管理平台", + "app.setting.appname": "极限数据中心", "layout.user.link.help": "帮助", "layout.user.link.privacy": "隐私",