ci: 补充 FileService 构建阶段,去掉 sudo
- 新增 构建 FileService stage(file-service / FileService.WebApi/Dockerfile), 使 6 个业务镜像与 docker-compose.yml 一致 - 移除所有 sudo docker 前缀:构建机 nanxunai 已在 docker 组,免提权运行 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Vendored
+22
-11
@@ -33,7 +33,7 @@ pipeline {
|
|||||||
]) {
|
]) {
|
||||||
sh """
|
sh """
|
||||||
set -e
|
set -e
|
||||||
echo "\$DOCKER_PASSWORD" | sudo docker login ${REGISTRY_HOST} -u "\$DOCKER_USERNAME" --password-stdin
|
echo "\$DOCKER_PASSWORD" | docker login ${REGISTRY_HOST} -u "\$DOCKER_USERNAME" --password-stdin
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,6 +83,17 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage('构建 FileService') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
buildImage(
|
||||||
|
"file-service",
|
||||||
|
"FileService.WebApi/Dockerfile"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
stage('构建 ConnectorService') {
|
stage('构建 ConnectorService') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
@@ -111,7 +122,7 @@ def buildImage(serviceName, dockerfilePath) {
|
|||||||
def latestName = "${env.IMAGE_PREFIX}-${serviceName}:latest"
|
def latestName = "${env.IMAGE_PREFIX}-${serviceName}:latest"
|
||||||
|
|
||||||
sh """
|
sh """
|
||||||
sudo docker build \
|
docker build \
|
||||||
--pull \
|
--pull \
|
||||||
-t ${imageName} \
|
-t ${imageName} \
|
||||||
-t ${latestName} \
|
-t ${latestName} \
|
||||||
@@ -121,21 +132,21 @@ def buildImage(serviceName, dockerfilePath) {
|
|||||||
if (env.REGISTRY?.trim()) {
|
if (env.REGISTRY?.trim()) {
|
||||||
|
|
||||||
sh """
|
sh """
|
||||||
sudo docker tag ${imageName} ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
|
docker tag ${imageName} ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
|
||||||
sudo docker tag ${latestName} ${env.REGISTRY}/${serviceName}:latest
|
docker tag ${latestName} ${env.REGISTRY}/${serviceName}:latest
|
||||||
|
|
||||||
sudo docker push ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
|
docker push ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG}
|
||||||
sudo docker push ${env.REGISTRY}/${serviceName}:latest
|
docker push ${env.REGISTRY}/${serviceName}:latest
|
||||||
|
|
||||||
sudo docker rmi ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} || true
|
docker rmi ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} || true
|
||||||
sudo docker rmi ${env.REGISTRY}/${serviceName}:latest || true
|
docker rmi ${env.REGISTRY}/${serviceName}:latest || true
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
|
|
||||||
sh """
|
sh """
|
||||||
sudo docker rmi ${imageName} || true
|
docker rmi ${imageName} || true
|
||||||
sudo docker rmi ${latestName} || true
|
docker rmi ${latestName} || true
|
||||||
|
|
||||||
sudo docker builder prune -f || true
|
docker builder prune -f || true
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user