diff --git a/Jenkinsfile b/Jenkinsfile index e2fe736..e5e1569 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,16 +2,9 @@ pipeline { agent any environment { - // Automatically detect registry and image name based on repo REGISTRY = "myharbor.local:80" - - // This MUST match your 'kubectl get deployments' name exactly - // Based on your previous logs, your backend deployment is 'ecommerce-app' APP_NAME = "ecommerce-app" - - // The image name for Harbor IMAGE_NAME = "ecommerce-backend" - IMAGE_TAG = "${REGISTRY}/library/${IMAGE_NAME}:${env.BRANCH_NAME}-${env.BUILD_NUMBER}" NAMESPACE = "ecommerce" } @@ -19,7 +12,6 @@ pipeline { stages { stage('Checkout') { steps { - // Ensure we have a clean copy of the code checkout scm } } @@ -27,9 +19,8 @@ pipeline { stage('Build Image') { steps { script { - // Using --pull and forcing the builder often bypasses BuildKit hang-ups - sh "docker build --pull --no-cache -t ${IMAGE_TAG} ." - sh "docker tag ${IMAGE_TAG} ${IMAGE_NAME}:latest" + // Stripped down to the bare minimum. No flags, just the tag. + sh "docker build -t ${IMAGE_TAG} ." } } } @@ -48,7 +39,7 @@ pipeline { stage('Inject to K8s Cache') { steps { script { - // This moves the image from Docker to Containerd so K8s can see it locally + // Export from Docker and Import to Containerd k8s namespace sh "docker save ${IMAGE_TAG} | sudo ctr -n k8s.io images import -" } } @@ -58,13 +49,11 @@ pipeline { steps { script { withCredentials([file(credentialsId: 'k8s-config', variable: 'KUBECONFIG')]) { - // Patching the existing deployment with the new build-specific image tag - // We use 'imagePullPolicy: Never' to force K8s to use the injected local image + // Update the deployment image and set pull policy to Never sh """ kubectl --kubeconfig=${KUBECONFIG} patch deployment ${APP_NAME} -n ${NAMESPACE} --patch \ '{"spec": {"template": {"spec": {"containers": [{"name": "${APP_NAME}", "image": "${IMAGE_TAG}", "imagePullPolicy": "Never"}]}}}}' """ - sh "kubectl --kubeconfig=${KUBECONFIG} rollout status deployment/${APP_NAME} -n ${NAMESPACE}" } } @@ -73,14 +62,8 @@ pipeline { } post { - success { - echo "Successfully deployed ${IMAGE_TAG} to ${NAMESPACE} namespace." - } - failure { - echo "Build or Deployment failed. Check Docker/BuildKit status on the agent." - } always { - // Clean up to keep the agent's disk from filling up + // Use || true so the build doesn't fail if the image was never created sh "docker rmi ${IMAGE_TAG} || true" } }