|
@@ -28,16 +28,15 @@ pipeline {
|
|
|
stage('构建镜像') {
|
|
|
steps {
|
|
|
sh "docker build --build-arg PROJECT_NAME=${JOB_NAME} --build-arg DEPLOY_ENV=${ENV} -t ${harborAddr}/${harborRepo}/${JOB_NAME}:${TAG} ${WORKSPACE}/${projectPath}/"
|
|
|
-// sh "docker rmi $(docker images -f 'dangling=true' -q)"
|
|
|
sh '''docker login -u ${harborUser} --password-stdin < /var/jenkins_home/docker/password ${harborAddr}
|
|
|
docker push ${harborAddr}/${harborRepo}/${JOB_NAME}:${TAG}
|
|
|
- docker rmi -f ${harborAddr}/${harborRepo}/${JOB_NAME}:${TAG}'''
|
|
|
+ docker images | grep ${JOB_NAME} | awk '{print $3}' | xargs docker rmi -f'''
|
|
|
}
|
|
|
}
|
|
|
|
|
|
stage('部署') {
|
|
|
steps {
|
|
|
- sh 'ssh root@192.168.0.185 "/usr/local/scripts/k8s/deploy.sh ${ENV} ${JOB_NAME} ${TAG} ${projectPort} ${projectNodePort}"'
|
|
|
+ sh 'ssh root@192.168.0.185 "/usr/local/scripts/k8s/deploy.sh ${ENV} ${JOB_NAME} ${TAG} ${projectPort} ${projectNodePort} ${warehouseNo}"'
|
|
|
}
|
|
|
}
|
|
|
}
|