diff --git a/Jenkinsfile b/Jenkinsfile index 20eed59..67da127 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { ]) { sh """ 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') { steps { script { @@ -111,7 +122,7 @@ def buildImage(serviceName, dockerfilePath) { def latestName = "${env.IMAGE_PREFIX}-${serviceName}:latest" sh """ - sudo docker build \ + docker build \ --pull \ -t ${imageName} \ -t ${latestName} \ @@ -121,21 +132,21 @@ def buildImage(serviceName, dockerfilePath) { if (env.REGISTRY?.trim()) { sh """ - sudo docker tag ${imageName} ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} - sudo docker tag ${latestName} ${env.REGISTRY}/${serviceName}:latest + docker tag ${imageName} ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} + docker tag ${latestName} ${env.REGISTRY}/${serviceName}:latest - sudo docker push ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} - sudo docker push ${env.REGISTRY}/${serviceName}:latest + docker push ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} + docker push ${env.REGISTRY}/${serviceName}:latest - sudo docker rmi ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} || true - sudo docker rmi ${env.REGISTRY}/${serviceName}:latest || true + docker rmi ${env.REGISTRY}/${serviceName}:${env.IMAGE_TAG} || true + docker rmi ${env.REGISTRY}/${serviceName}:latest || true """ } sh """ - sudo docker rmi ${imageName} || true - sudo docker rmi ${latestName} || true + docker rmi ${imageName} || true + docker rmi ${latestName} || true - sudo docker builder prune -f || true + docker builder prune -f || true """ } \ No newline at end of file