diff --git a/rc-gateway/pipeline-dev b/rc-gateway/pipeline-dev index 9476487f..13041418 100644 --- a/rc-gateway/pipeline-dev +++ b/rc-gateway/pipeline-dev @@ -10,13 +10,11 @@ pipeline { environment { PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" - BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:gateway-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" JAR_SIZE = "" JAR_TARGET_DIR = "rc-gateway/target" JAR_NAME = "rc-gateway-*.jar" - ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/gateway" - IMAGE_REP_TAG = "" + IMAGE_TAG = "azizi-dev/gateway:latest" DOCKER_FILE = "rc-gateway/Dockerfile-dev" DOCKER_DIR = "rc-gateway" K8S_NAMESPACE = "azizi" @@ -33,39 +31,21 @@ pipeline { script { JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}" JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}" - IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:gateway-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}" } echo "---> Jar file: ${JAR_FILE}" echo "---> Jar size: ${JAR_SIZE}" - echo "---> Image name: ${BUILD_IMAGE}" - echo "---> Image registry tag: ${IMAGE_REP_TAG}" } } } stage('Build image') { steps { - withCredentials([usernamePassword( - credentialsId: 'aliyun-registry', - usernameVariable: 'ALIYUN_USER', - passwordVariable: 'ALIYUN_PASS' - )]) { - sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com' - } - sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}" - } - } - stage('Upload image') { - steps { - sh "docker push ${IMAGE_REP_TAG}" - sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/gateway:latest" - sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/gateway:latest" - sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/gateway:latest" + sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}" } } stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}" } } } diff --git a/rc-service/rc-service-external/pipeline-dev b/rc-service/rc-service-external/pipeline-dev index 65d189c2..5cc254cc 100644 --- a/rc-service/rc-service-external/pipeline-dev +++ b/rc-service/rc-service-external/pipeline-dev @@ -10,13 +10,11 @@ pipeline { environment { PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" - BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:external-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" JAR_SIZE = "" JAR_TARGET_DIR = "rc-service/rc-service-external/external-start/target" JAR_NAME = "rc-service-external-*.jar" - ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/external" - IMAGE_REP_TAG = "" + IMAGE_TAG = "azizi-dev/external:latest" DOCKER_FILE = "rc-service/rc-service-external/Dockerfile-dev" DOCKER_DIR = "rc-service/rc-service-external" K8S_NAMESPACE = "azizi" @@ -33,39 +31,21 @@ pipeline { script { JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}" JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}" - IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:external-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}" } echo "---> Jar file: ${JAR_FILE}" echo "---> Jar size: ${JAR_SIZE}" - echo "---> Image name: ${BUILD_IMAGE}" - echo "---> Image registry tag: ${IMAGE_REP_TAG}" } } } stage('Build image') { steps { - withCredentials([usernamePassword( - credentialsId: 'aliyun-registry', - usernameVariable: 'ALIYUN_USER', - passwordVariable: 'ALIYUN_PASS' - )]) { - sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com' - } - sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}" - } - } - stage('Upload image') { - steps { - sh "docker push ${IMAGE_REP_TAG}" - sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/external:latest" - sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/external:latest" - sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/external:latest" + sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}" } } stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}" } } } diff --git a/rc-service/rc-service-live/pipeline-dev b/rc-service/rc-service-live/pipeline-dev index cbec2211..01835fec 100644 --- a/rc-service/rc-service-live/pipeline-dev +++ b/rc-service/rc-service-live/pipeline-dev @@ -10,13 +10,11 @@ pipeline { environment { PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" - BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:live-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" JAR_SIZE = "" JAR_TARGET_DIR = "rc-service/rc-service-live/live-start/target" JAR_NAME = "rc-service-live-*.jar" - ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/live" - IMAGE_REP_TAG = "" + IMAGE_TAG = "azizi-dev/live:latest" DOCKER_FILE = "rc-service/rc-service-live/Dockerfile-dev" DOCKER_DIR = "rc-service/rc-service-live" K8S_NAMESPACE = "azizi" @@ -33,39 +31,21 @@ pipeline { script { JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}" JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}" - IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:live-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}" } echo "---> Jar file: ${JAR_FILE}" echo "---> Jar size: ${JAR_SIZE}" - echo "---> Image name: ${BUILD_IMAGE}" - echo "---> Image registry tag: ${IMAGE_REP_TAG}" } } } stage('Build image') { steps { - withCredentials([usernamePassword( - credentialsId: 'aliyun-registry', - usernameVariable: 'ALIYUN_USER', - passwordVariable: 'ALIYUN_PASS' - )]) { - sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com' - } - sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}" - } - } - stage('Upload image') { - steps { - sh "docker push ${IMAGE_REP_TAG}" - sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/live:latest" - sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/live:latest" - sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/live:latest" + sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}" } } stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}" } } } diff --git a/rc-service/rc-service-order/pipeline-dev b/rc-service/rc-service-order/pipeline-dev index 93fd68de..5bab23d9 100644 --- a/rc-service/rc-service-order/pipeline-dev +++ b/rc-service/rc-service-order/pipeline-dev @@ -10,13 +10,11 @@ pipeline { environment { PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" - BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:order-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" JAR_SIZE = "" JAR_TARGET_DIR = "rc-service/rc-service-order/order-start/target" JAR_NAME = "rc-service-order-*.jar" - ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/order" - IMAGE_REP_TAG = "" + IMAGE_TAG = "azizi-dev/order:latest" DOCKER_FILE = "rc-service/rc-service-order/Dockerfile-dev" DOCKER_DIR = "rc-service/rc-service-order" K8S_NAMESPACE = "azizi" @@ -33,39 +31,21 @@ pipeline { script { JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}" JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}" - IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:order-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}" } echo "---> Jar file: ${JAR_FILE}" echo "---> Jar size: ${JAR_SIZE}" - echo "---> Image name: ${BUILD_IMAGE}" - echo "---> Image registry tag: ${IMAGE_REP_TAG}" } } } stage('Build image') { steps { - withCredentials([usernamePassword( - credentialsId: 'aliyun-registry', - usernameVariable: 'ALIYUN_USER', - passwordVariable: 'ALIYUN_PASS' - )]) { - sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com' - } - sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}" - } - } - stage('Upload image') { - steps { - sh "docker push ${IMAGE_REP_TAG}" - sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/order:latest" - sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/order:latest" - sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/order:latest" + sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}" } } stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}" } } } diff --git a/rc-service/rc-service-other/pipeline-dev b/rc-service/rc-service-other/pipeline-dev index 156870cb..9f97b192 100644 --- a/rc-service/rc-service-other/pipeline-dev +++ b/rc-service/rc-service-other/pipeline-dev @@ -10,13 +10,11 @@ pipeline { environment { PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" - BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:other-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" JAR_SIZE = "" JAR_TARGET_DIR = "rc-service/rc-service-other/other-start/target" JAR_NAME = "rc-service-other-*.jar" - ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/other" - IMAGE_REP_TAG = "" + IMAGE_TAG = "azizi-dev/other:latest" DOCKER_FILE = "rc-service/rc-service-other/Dockerfile-dev" DOCKER_DIR = "rc-service/rc-service-other" K8S_NAMESPACE = "azizi" @@ -33,39 +31,21 @@ pipeline { script { JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}" JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}" - IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:other-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}" } echo "---> Jar file: ${JAR_FILE}" echo "---> Jar size: ${JAR_SIZE}" - echo "---> Image name: ${BUILD_IMAGE}" - echo "---> Image registry tag: ${IMAGE_REP_TAG}" } } } stage('Build image') { steps { - withCredentials([usernamePassword( - credentialsId: 'aliyun-registry', - usernameVariable: 'ALIYUN_USER', - passwordVariable: 'ALIYUN_PASS' - )]) { - sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com' - } - sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}" - } - } - stage('Upload image') { - steps { - sh "docker push ${IMAGE_REP_TAG}" - sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/other:latest" - sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/other:latest" - sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/other:latest" + sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}" } } stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}" } } } diff --git a/rc-service/rc-service-wallet/pipeline-dev b/rc-service/rc-service-wallet/pipeline-dev index 8f706648..ae800577 100644 --- a/rc-service/rc-service-wallet/pipeline-dev +++ b/rc-service/rc-service-wallet/pipeline-dev @@ -10,13 +10,11 @@ pipeline { environment { PATH = "/var/jenkins_home/docker-cli/bin:/var/jenkins_home/jdk-17/bin:/var/jenkins_home/kubectl/bin:${env.PATH}" - BUILD_IMAGE = "${sh(script:'echo -n azizi-dev:wallet-$(date +%Y%m%dv%H%M%S)', returnStdout: true)}" JAR_FILE = "" JAR_SIZE = "" JAR_TARGET_DIR = "rc-service/rc-service-wallet/wallet-start/target" JAR_NAME = "rc-service-wallet-*.jar" - ALIYUN_REGISTRY = "registry.cn-hangzhou.aliyuncs.com/azizi-dev/wallet" - IMAGE_REP_TAG = "" + IMAGE_TAG = "azizi-dev/wallet:latest" DOCKER_FILE = "rc-service/rc-service-wallet/Dockerfile-dev" DOCKER_DIR = "rc-service/rc-service-wallet" K8S_NAMESPACE = "azizi" @@ -33,39 +31,21 @@ pipeline { script { JAR_FILE = "${sh(script:'ls -t ${JAR_TARGET_DIR}/${JAR_NAME} | head -n 1', returnStdout: true).trim()}" JAR_SIZE = "${sh(script:'du -h ${JAR_TARGET_DIR}/${JAR_NAME}', returnStdout: true).trim()}" - IMAGE_REP_TAG = "${ALIYUN_REGISTRY}:wallet-${sh(script:'date +%Y%m%dv%H%M%S', returnStdout: true).trim()}" } echo "---> Jar file: ${JAR_FILE}" echo "---> Jar size: ${JAR_SIZE}" - echo "---> Image name: ${BUILD_IMAGE}" - echo "---> Image registry tag: ${IMAGE_REP_TAG}" } } } stage('Build image') { steps { - withCredentials([usernamePassword( - credentialsId: 'aliyun-registry', - usernameVariable: 'ALIYUN_USER', - passwordVariable: 'ALIYUN_PASS' - )]) { - sh 'echo $ALIYUN_PASS | docker login --username $ALIYUN_USER --password-stdin registry.cn-hangzhou.aliyuncs.com' - } - sh "docker build --build-arg SERVICE_VERSION=${BUILD_IMAGE} -f ${DOCKER_FILE} -t ${IMAGE_REP_TAG} ${DOCKER_DIR}" - } - } - stage('Upload image') { - steps { - sh "docker push ${IMAGE_REP_TAG}" - sh "docker tag ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/wallet:latest" - sh "docker push registry.cn-hangzhou.aliyuncs.com/azizi-dev/wallet:latest" - sh "docker rmi -f ${IMAGE_REP_TAG} registry.cn-hangzhou.aliyuncs.com/azizi-dev/wallet:latest" + sh "docker build -f ${DOCKER_FILE} -t ${IMAGE_TAG} ${DOCKER_DIR}" } } stage('Apply') { steps { sh "pwd && whoami" - sh "kubectl -n ${K8S_NAMESPACE} set image deployment/${K8S_DEPLOYMENT} ${K8S_APP_LABEL}=${IMAGE_REP_TAG}" + sh "kubectl -n ${K8S_NAMESPACE} rollout restart deployment/${K8S_DEPLOYMENT}" } } }