diff --git a/Jenkinsfile b/Jenkinsfile index fd6f76e..20bae70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,53 +23,46 @@ pipeline { agent { docker { image 'bufbuild/buf:latest' - args '--entrypoint=' - reuseNode true - } - } - environment { - BUF_CACHE_DIR="${env.WORKSPACE}/.cache" - } - steps { - dir("${env.WORKSPACE}") { - echo "Generating Swagger documentation..." - sh "buf generate" - } - } - } - stage('Convert OpenAPI to v3') { - agent { - docker { - image 'python:3-bookworm' reuseNode true } } steps { dir("${env.WORKSPACE}") { - echo "Converting OpenAPI V2 to V3..." - sh "python3 scripts/process_openapiv2.py" + sh ''' + echo "Generating Swagger documentation..." + buf generate + + echo "Converting OpenAPI V2 to V3..." + python3 scripts/process_openapiv2.py + ''' } } } stage('Build Docker Image') { steps { - echo "Building Docker image..." - sh "docker build -t ${DOCKER_REGISTRY}/${IMAGE_NAME}:${BUILD_ID} -f deployments/docker/Dockerfile deployments/docker/" + sh ''' + echo "Building Docker image..." + docker build -t ${DOCKER_REGISTRY}/${IMAGE_NAME}:${BUILD_ID} \ + -f deployments/docker/Dockerfile deployments/docker/ + ''' } } stage('Push Docker Image') { steps { withCredentials([usernamePassword( - credentialsId: 'docker-registry-creds', // <-- Update to your Jenkins credentials ID + credentialsId: 'postio-bot-gitea', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS' )]) { - echo "Logging into Docker registry..." - sh "echo $DOCKER_PASS | docker login ${DOCKER_REGISTRY} -u $DOCKER_USER --password-stdin" - echo "Pushing Docker image..." - sh "docker push ${DOCKER_REGISTRY}/${IMAGE_NAME}:${BUILD_ID}" + sh ''' + echo "Logging into Docker registry..." + echo $DOCKER_PASS | docker login ${DOCKER_REGISTRY} -u $DOCKER_USER --password-stdin + + echo "Pushing Docker image..." + docker push ${DOCKER_REGISTRY}/${IMAGE_NAME}:${BUILD_ID} + ''' } } }