From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
Jenkinsfile-docker-compose | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/Jenkinsfile-docker-compose b/Jenkinsfile-docker-compose
index 5cf3369..435604f 100644
--- a/Jenkinsfile-docker-compose
+++ b/Jenkinsfile-docker-compose
@@ -2,21 +2,8 @@
agent any
//变量定义
environment {
- CREDENTIALSID = 'smartcook'
- GIT_URL = 'http://gitlab.iotmars.com/backend/smartcook/smartcook.git'
- BRANCH = 'dev'
- ALIYUN_NAMESPACE = 'wecook'
- ALIYUN_REPOSITORY = 'menu-center-dev'
- IMAGE_VERSION = '0.0.1-SNAPSHOT'
- DOCKER_CONTAINER_NAME = 'smartcook'
- REMOTE_SERVER_IP = '192.168.32.128'
- REMOTE_SERVER_NAME = 'localhost.localdomain'
- REMOTE_SERVER_CREDENTIALSID = 'server_128'
- REMOTE_REPOSITORY_CREDENTIALSID = 'hxr_aliyun'
- SERVER_PORT = '8002'
- EMAIL = '792965772@qq.com'
REGISTRY = 'registry.cn-hangzhou.aliyuncs.com'
- DOCKERHUB_NAMESPACE = 'arsn'
+ ALIYUN_NAMESPACE = 'arsn'
}
stages {
@@ -46,8 +33,10 @@
script{
withCredentials([usernamePassword(credentialsId: 'aliyun', passwordVariable: 'password', usernameVariable: 'username')]) {
sh 'echo "$password" | docker login $REGISTRY -u "$username" --password-stdin'
- sh 'docker tag zhbaw:latest $REGISTRY/$DOCKERHUB_NAMESPACE/zhbaw:SNAPSHOT-$BUILD_NUMBER'
- sh 'docker push $REGISTRY/$DOCKERHUB_NAMESPACE/zhbaw:SNAPSHOT-$BUILD_NUMBER'
+ sh 'docker tag zhbaw:latest $REGISTRY/$ALIYUN_NAMESPACE/zhbaw:SNAPSHOT-$BUILD_NUMBER'
+ sh 'docker push $REGISTRY/$ALIYUN_NAMESPACE/zhbaw:SNAPSHOT-$BUILD_NUMBER'
+ sh 'docker rmi $REGISTRY/$DOCKERHUB_NAMESPACE/zhbaw:SNAPSHOT-$BUILD_NUMBER'
+ sh 'docker rmi zhbaw:latest'
}
}
}
@@ -57,6 +46,7 @@
steps {
input '是否部署？'
sh 'docker-compose up -d'
+ sh 'docker rmi $REGISTRY/$DOCKERHUB_NAMESPACE/zhbaw:SNAPSHOT-$(BUILD_NUMBER-1)'
}
}
}
--
Gitblit v1.9.3