From 6bf7687dd5e934074b59ad77ed07ad2074c24873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <>
Date: Mon, 10 Feb 2025 03:44:16 +0800
Subject: [PATCH] fix(pipeline): refactor cleanup hook for buildx builder in
 ImageBuilder class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 孙振宇 <>
---
 .../src/com/freeleaps/devops/ImageBuilder.groovy           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index c5dae653..d9e66d2b 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -62,10 +62,9 @@ class ImageBuilder {
       steps.log.info("ImageBuilder", "Inspecting buildx builder with name: multiarch-builder-${name}")
       steps.sh "docker buildx inspect --bootstrap"
       steps.log.info("ImageBuilder", "Register clean up hook for buildx builder deletion for builder named: multiarch-builder-${name}")
-      steps.post {
-        always {
-          steps.sh "docker buildx rm multiarch-builder-${name} || true"
-        }
+      def context = steps.$build()
+      context.cleanup {
+        steps.sh "docker buildx rm multiarch-builder-${name} || true"
       }
       this.buildxBuilderName = "multiarch-builder-${name}"
     }