diff --git a/Jenkinsfile b/Jenkinsfile index cbdec133..4618f3ca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,8 +20,8 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && rm -rif web' sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm install' - 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 'cd /home/jenkins/go/src/infini.sh/search-center/web && mv static/* ../.public' sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-linux' sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-arm' sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-darwin' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 26afaa73..596e961e 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -20,8 +20,13 @@ 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' - sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install' + + sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && rm -rif web' + sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm run build' + sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && mv static/* ../.public' + 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'