From 37ff95f37fb39303ed21dfdf0d6a22269f829e2b Mon Sep 17 00:00:00 2001
From: okrc <okrc@hexo.dev>
Date: Fri, 7 Apr 2023 08:21:33 +0000
Subject: [PATCH 1/3] update jenkins/rootfs/do_build_rootfs.sh.

---
 jenkins/rootfs/do_build_rootfs.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 jenkins/rootfs/do_build_rootfs.sh

diff --git a/jenkins/rootfs/do_build_rootfs.sh b/jenkins/rootfs/do_build_rootfs.sh
old mode 100644
new mode 100755
index fc9100d..5f2787b
--- a/jenkins/rootfs/do_build_rootfs.sh
+++ b/jenkins/rootfs/do_build_rootfs.sh
@@ -4,15 +4,16 @@ set -eE
 trap cleanup ERR
 
 function cleanup() {
-    [ ! -z "$(docker buildx ls |grep buildx-$release-$arch)" ] && docker buildx rm buildx-$release-$arch
+    [ ! -z "$(docker buildx ls | grep buildx-$release-$arch)" ] && docker buildx rm buildx-$release-$arch
 }
 
 [ -d $WORKSPACE/outdir/ ] && rm -rvf $WORKSPACE/outdir/* || mkdir -pv $WORKSPACE/outdir
 docker info
 docker buildx ls
 docker ps -a
-[ -z "$(docker buildx ls |grep buildx-$release-$arch)" ] && docker buildx create --bootstrap --use --name buildx-$release-$arch || docker buildx use buildx-$release-$arch
+[ -z "$(docker buildx ls | grep buildx-$release-$arch)" ] && docker buildx create --bootstrap --use --name buildx-$release-$arch || docker buildx use buildx-$release-$arch
 # build rootfs docker image
-docker buildx build --build-arg REL_TAG=$release --platform linux/$arch --tag openeuler-wsl:$release --squash --cache-from=type=local,src=/var/cache/buildx/$release-$arch --cache-to=type=local,dest=/var/cache/buildx/$release-$arch \
-    -o type=tar,dest=$WORKSPACE/outdir/$release-$arch.tar $WORKSPACE/docker/
-docker run --rm -v $WORKSPACE/:/wd bytesco/pigz -9 -v -Y -f /wd/outdir/$release-$arch.tar
+docker buildx build --build-arg REL_TAG=$release --platform linux/$arch --tag openeuler-wsl:$release-$arch --load --cache-from=type=local,src=/var/cache/buildx/$release-$arch --cache-to=type=local,dest=/var/cache/buildx/$release-$arch \
+    $WORKSPACE/docker/
+docker run --rm --platform linux/$arch openeuler-wsl:$release-$arch >$WORKSPACE/outdir/$release-$arch.tar.gz
+docker rmi openeuler-wsl:$release-$arch
-- 
Gitee


From 2e55b9657dcb9bb38531bf2acf6ec01dd006bdc4 Mon Sep 17 00:00:00 2001
From: okrc <okrc@hexo.dev>
Date: Fri, 7 Apr 2023 09:00:13 +0000
Subject: [PATCH 2/3] update jenkins/rootfs/do_build_rootfs.sh.

---
 jenkins/rootfs/do_build_rootfs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jenkins/rootfs/do_build_rootfs.sh b/jenkins/rootfs/do_build_rootfs.sh
index 5f2787b..b8f5b5b 100755
--- a/jenkins/rootfs/do_build_rootfs.sh
+++ b/jenkins/rootfs/do_build_rootfs.sh
@@ -16,4 +16,5 @@ docker ps -a
 docker buildx build --build-arg REL_TAG=$release --platform linux/$arch --tag openeuler-wsl:$release-$arch --load --cache-from=type=local,src=/var/cache/buildx/$release-$arch --cache-to=type=local,dest=/var/cache/buildx/$release-$arch \
     $WORKSPACE/docker/
 docker run --rm --platform linux/$arch openeuler-wsl:$release-$arch >$WORKSPACE/outdir/$release-$arch.tar.gz
+docker ps -aq --filter ancestor=openeuler-wsl:$release-$arch | xargs -r docker rm
 docker rmi openeuler-wsl:$release-$arch
-- 
Gitee


From 4e34cd9eae9407de6ce10333e05b5a9ce3ae0480 Mon Sep 17 00:00:00 2001
From: okrc <okrc@hexo.dev>
Date: Fri, 7 Apr 2023 09:05:14 +0000
Subject: [PATCH 3/3] update jenkins/rootfs/do_build_rootfs.sh.

---
 jenkins/rootfs/do_build_rootfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins/rootfs/do_build_rootfs.sh b/jenkins/rootfs/do_build_rootfs.sh
index b8f5b5b..4f2c0ca 100755
--- a/jenkins/rootfs/do_build_rootfs.sh
+++ b/jenkins/rootfs/do_build_rootfs.sh
@@ -16,5 +16,5 @@ docker ps -a
 docker buildx build --build-arg REL_TAG=$release --platform linux/$arch --tag openeuler-wsl:$release-$arch --load --cache-from=type=local,src=/var/cache/buildx/$release-$arch --cache-to=type=local,dest=/var/cache/buildx/$release-$arch \
     $WORKSPACE/docker/
 docker run --rm --platform linux/$arch openeuler-wsl:$release-$arch >$WORKSPACE/outdir/$release-$arch.tar.gz
-docker ps -aq --filter ancestor=openeuler-wsl:$release-$arch | xargs -r docker rm
+docker ps -aq --filter ancestor=openeuler-wsl:$release-$arch | xargs -r docker stop | xargs -r docker rm
 docker rmi openeuler-wsl:$release-$arch
-- 
Gitee