From 63e923d327dabfe1dd5be2493850c2fe30ac9aee Mon Sep 17 00:00:00 2001
From: kulukami <kulukami@gmail.com>
Date: Thu, 7 Mar 2024 10:21:37 +0800
Subject: [PATCH] update CI for v1.9 ko

---
 .github/workflows/Elkeid_driver_release.yml   | 15 ++++++++-----
 driver/build_script/aarch64/batch_compile.sh  |  1 +
 .../build_script/aarch64/batch_compile_el7.sh |  1 +
 .../build_script/aarch64/batch_compile_el8.sh |  1 +
 .../aarch64/batch_compile_ol8_uek.sh          |  1 +
 .../build_script/gen_ci_from_dockerfiles.py   | 19 +++++++++++------
 driver/build_script/x86_64/batch_compile.sh   |  1 +
 .../build_script/x86_64/batch_compile_el7.sh  |  1 +
 .../x86_64/batch_compile_el7_centosplus.sh    |  1 +
 .../x86_64/batch_compile_el8_plus.sh          |  1 +
 .../x86_64/batch_compile_elrepo6.sh           |  1 +
 .../x86_64/batch_compile_elrepo7_lt.sh        |  1 +
 .../batch_compile_elrepo7_lt_archive.sh       |  1 +
 .../x86_64/batch_compile_elrepo7_ml.sh        |  1 +
 .../batch_compile_elrepo7_ml_archive.sh       |  1 +
 .../x86_64/batch_compile_elrepo8_lt.sh        |  1 +
 .../x86_64/batch_compile_elrepo8_ml.sh        |  1 +
 .../x86_64/batch_compile_ol8_uek.sh           |  1 +
 .../x86_64/batch_compile_tencentos.sh         |  1 +
 .../Dockerfile.aliyun_linux3                  |  1 +
 driver/dockerfiles.aarch64/Dockerfile.ol8_uek |  1 +
 driver/dockerfiles.aarch64/Dockerfile.rhel7   |  2 +-
 driver/dockerfiles.aarch64/Dockerfile.rhel8   |  1 +
 .../Dockerfile.aliyun_linux2                  |  1 +
 .../Dockerfile.aliyun_linux3                  |  1 +
 .../dockerfiles.x86_64/Dockerfile.almalinux8  |  1 +
 .../dockerfiles.x86_64/Dockerfile.almalinux9  |  1 +
 driver/dockerfiles.x86_64/Dockerfile.anolis8  | 21 ++++++++++---------
 driver/dockerfiles.x86_64/Dockerfile.ol8_uek  |  1 +
 driver/dockerfiles.x86_64/Dockerfile.oracle7  |  1 +
 .../dockerfiles.x86_64/Dockerfile.oracle8_uek |  1 +
 driver/dockerfiles.x86_64/Dockerfile.rhel6    |  8 +++----
 driver/dockerfiles.x86_64/Dockerfile.rhel7    |  2 +-
 .../Dockerfile.rhel7_centosplus               |  2 +-
 driver/dockerfiles.x86_64/Dockerfile.rhel8    |  1 +
 .../dockerfiles.x86_64/Dockerfile.rhel8_plus  |  1 +
 driver/dockerfiles.x86_64/Dockerfile.rocky8   |  1 +
 driver/dockerfiles.x86_64/Dockerfile.rocky9   |  1 +
 38 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/Elkeid_driver_release.yml b/.github/workflows/Elkeid_driver_release.yml
index 32261b8c8..6f5f61a70 100644
--- a/.github/workflows/Elkeid_driver_release.yml
+++ b/.github/workflows/Elkeid_driver_release.yml
@@ -2545,11 +2545,16 @@ jobs:
       with:
         path: ~/all_elkeid_drivers
     - name: Prepare artifact 1 mkdir
-      run: mkdir -p elkeid_driver/ko elkeid_driver/log
-    - name: Prepare artifact 2-1 ko
-      run: mv -f ~/all_elkeid_drivers/*/*.ko elkeid_driver/ko || true
-    - name: Prepare artifact 2-2 sign
-      run: mv -f ~/all_elkeid_drivers/*/*.sign elkeid_driver/ko || true
+      run: mkdir -p elkeid_driver/ko/aarch64 elkeid_driver/ko/x86_64 elkeid_driver/log
+    - name: Prepare artifact 2-1-1 x86_64 ko
+      run: mv -f ~/all_elkeid_drivers/*/*amd64*ko elkeid_driver/ko/x86_64/. || true
+    - name: Prepare artifact 2-1-2 aarch64 ko
+      run: mv -f ~/all_elkeid_drivers/*/*arm64*ko elkeid_driver/ko/aarch64/. || true
+    - name: Prepare artifact 2-1-1 x86_64 sign
+      run: mv -f ~/all_elkeid_drivers/*/*amd64*sign elkeid_driver/ko/x86_64/. || true
+    - name: Prepare artifact 2-1-2 aarch64 ko
+      run: mv -f ~/all_elkeid_drivers/*/*arm64*sign elkeid_driver/ko/aarch64/. ||
+        true
     - name: Prepare artifact 2-3 log
       run: mv -f ~/all_elkeid_drivers/*/*.log elkeid_driver/log || true
     - name: Pack artifact
diff --git a/driver/build_script/aarch64/batch_compile.sh b/driver/build_script/aarch64/batch_compile.sh
index 15556d62a..7d3109a39 100644
--- a/driver/build_script/aarch64/batch_compile.sh
+++ b/driver/build_script/aarch64/batch_compile.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/aarch64/batch_compile_el7.sh b/driver/build_script/aarch64/batch_compile_el7.sh
index b6d30f6a2..9ac88e8f9 100644
--- a/driver/build_script/aarch64/batch_compile_el7.sh
+++ b/driver/build_script/aarch64/batch_compile_el7.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/aarch64/batch_compile_el8.sh b/driver/build_script/aarch64/batch_compile_el8.sh
index 71ec57dba..13fd1891b 100644
--- a/driver/build_script/aarch64/batch_compile_el8.sh
+++ b/driver/build_script/aarch64/batch_compile_el8.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/aarch64/batch_compile_ol8_uek.sh b/driver/build_script/aarch64/batch_compile_ol8_uek.sh
index 1cdd76c3f..4564d06d8 100644
--- a/driver/build_script/aarch64/batch_compile_ol8_uek.sh
+++ b/driver/build_script/aarch64/batch_compile_ol8_uek.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/gen_ci_from_dockerfiles.py b/driver/build_script/gen_ci_from_dockerfiles.py
index 26515714a..b4bb38625 100644
--- a/driver/build_script/gen_ci_from_dockerfiles.py
+++ b/driver/build_script/gen_ci_from_dockerfiles.py
@@ -177,17 +177,24 @@ def gen_job(vminfo):
 
             OrderedDict({
                 "name": "Prepare artifact 1 mkdir",
-                "run": "mkdir -p elkeid_driver/ko elkeid_driver/log"
+                "run": "mkdir -p elkeid_driver/ko/aarch64 elkeid_driver/ko/x86_64 elkeid_driver/log"
             }),
 
             OrderedDict({
-                "name": "Prepare artifact 2-1 ko",
-                "run": "mv -f ~/all_elkeid_drivers/*/*.ko elkeid_driver/ko || true"
+                "name": "Prepare artifact 2-1-1 x86_64 ko",
+                "run": "mv -f ~/all_elkeid_drivers/*/*amd64*ko elkeid_driver/ko/x86_64/. || true"
+            }),
+            OrderedDict({
+                "name": "Prepare artifact 2-1-2 aarch64 ko",
+                "run": "mv -f ~/all_elkeid_drivers/*/*arm64*ko elkeid_driver/ko/aarch64/. || true"
+            }),
+            OrderedDict({
+                "name": "Prepare artifact 2-1-1 x86_64 sign",
+                "run": "mv -f ~/all_elkeid_drivers/*/*amd64*sign elkeid_driver/ko/x86_64/. || true"
             }),
-
             OrderedDict({
-                "name": "Prepare artifact 2-2 sign",
-                "run": "mv -f ~/all_elkeid_drivers/*/*.sign elkeid_driver/ko || true"
+                "name": "Prepare artifact 2-1-2 aarch64 ko",
+                "run": "mv -f ~/all_elkeid_drivers/*/*arm64*sign elkeid_driver/ko/aarch64/. || true"
             }),
 
             OrderedDict({
diff --git a/driver/build_script/x86_64/batch_compile.sh b/driver/build_script/x86_64/batch_compile.sh
index e2a2de37a..f765b72f9 100644
--- a/driver/build_script/x86_64/batch_compile.sh
+++ b/driver/build_script/x86_64/batch_compile.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_el7.sh b/driver/build_script/x86_64/batch_compile_el7.sh
index 79607fcaa..587e3a9fc 100644
--- a/driver/build_script/x86_64/batch_compile_el7.sh
+++ b/driver/build_script/x86_64/batch_compile_el7.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_el7_centosplus.sh b/driver/build_script/x86_64/batch_compile_el7_centosplus.sh
index b41625fab..f05abffc9 100644
--- a/driver/build_script/x86_64/batch_compile_el7_centosplus.sh
+++ b/driver/build_script/x86_64/batch_compile_el7_centosplus.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_el8_plus.sh b/driver/build_script/x86_64/batch_compile_el8_plus.sh
index f8ba994a4..6d3ff8bf5 100644
--- a/driver/build_script/x86_64/batch_compile_el8_plus.sh
+++ b/driver/build_script/x86_64/batch_compile_el8_plus.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo6.sh b/driver/build_script/x86_64/batch_compile_elrepo6.sh
index 199871c4c..6597535fe 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo6.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo6.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh b/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh
index 2a27eff92..c8e3e9b44 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo7_lt.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh b/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh
index 77800a9c6..80e0746e2 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo7_lt_archive.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh b/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh
index 2af7029b2..73d4f71b3 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo7_ml.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh b/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh
index ad9a12792..0df9d86f1 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo7_ml_archive.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh b/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh
index b2d2adbbb..8d5f27420 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo8_lt.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh b/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh
index 2b63fa548..2f994d8b8 100644
--- a/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh
+++ b/driver/build_script/x86_64/batch_compile_elrepo8_ml.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_ol8_uek.sh b/driver/build_script/x86_64/batch_compile_ol8_uek.sh
index 1dd0b5cb7..b774d6c46 100644
--- a/driver/build_script/x86_64/batch_compile_ol8_uek.sh
+++ b/driver/build_script/x86_64/batch_compile_ol8_uek.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/build_script/x86_64/batch_compile_tencentos.sh b/driver/build_script/x86_64/batch_compile_tencentos.sh
index 297238adb..3561f321d 100644
--- a/driver/build_script/x86_64/batch_compile_tencentos.sh
+++ b/driver/build_script/x86_64/batch_compile_tencentos.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+rm -rf /ko_output || true
 mkdir -p /ko_output
 BUILD_VERSION=$(cat LKM/include/kprobe.h | grep SMITH_VERSION | awk -F '"' '{print $2}')
 KO_NAME=$(grep "MODULE_NAME" ./LKM/Makefile | grep -m 1 ":=" | awk '{print $3}')
diff --git a/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3 b/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3
index 431cc36a1..fadedb04c 100644
--- a/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3
+++ b/driver/dockerfiles.aarch64/Dockerfile.aliyun_linux3
@@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ]
 RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AliYun.repo;
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN for each_tag in `dnf --showduplicates list kernel-devel | grep kernel-devel | awk -c '{print $2}'`; do dnf -y install --downloadonly --downloaddir=/root/headers kernel-devel-$each_tag.aarch64; done
 RUN rpm --force -i /root/headers/*.rpm  || true
diff --git a/driver/dockerfiles.aarch64/Dockerfile.ol8_uek b/driver/dockerfiles.aarch64/Dockerfile.ol8_uek
index 6d99e6141..88ec70ea5 100644
--- a/driver/dockerfiles.aarch64/Dockerfile.ol8_uek
+++ b/driver/dockerfiles.aarch64/Dockerfile.ol8_uek
@@ -7,6 +7,7 @@ RUN dnf install -y wget perl gcc make tree openssl-devel openssl gcc-toolset-11
 
 RUN dnf groupinstall -y  "Development Tools"; 
 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 RUN dnf config-manager --set-enable ol8_UEKR7
diff --git a/driver/dockerfiles.aarch64/Dockerfile.rhel7 b/driver/dockerfiles.aarch64/Dockerfile.rhel7
index 2989b19ca..1df715f7f 100644
--- a/driver/dockerfiles.aarch64/Dockerfile.rhel7
+++ b/driver/dockerfiles.aarch64/Dockerfile.rhel7
@@ -5,7 +5,7 @@ RUN yum install -y wget perl gcc make tree elfutils-libelf-devel yumdownloader g
 RUN yum groupinstall -y  "Development Tools"; 
 RUN yum install -y centos-release-scl
 RUN yum install -y devtoolset-8
-
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 ADD . /elkeid
diff --git a/driver/dockerfiles.aarch64/Dockerfile.rhel8 b/driver/dockerfiles.aarch64/Dockerfile.rhel8
index 324eb3ba7..5402013e0 100644
--- a/driver/dockerfiles.aarch64/Dockerfile.rhel8
+++ b/driver/dockerfiles.aarch64/Dockerfile.rhel8
@@ -6,6 +6,7 @@ RUN dnf groupinstall -y  "Development Tools";
 RUN dnf install -y centos-release-scl
 RUN dnf install -y devtoolset-8
 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 ADD . /elkeid
diff --git a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2 b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2
index 2557228c7..01bdd4290 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2
+++ b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux2
@@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ]
 RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AliYun.repo;
 RUN yum install -y wget perl gcc make tree elfutils-libelf-devel yumdownloader; 
 RUN yum groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN for each_tag in `yum --showduplicates list kernel-devel | grep kernel-devel | awk -c '{print $2}'`; do yumdownloader  --destdir /root/headers kernel-devel-$each_tag.x86_64; done
 RUN rpm --force -i /root/headers/*.rpm  || true
diff --git a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3 b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3
index e20e25052..eb78cdf5f 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3
+++ b/driver/dockerfiles.x86_64/Dockerfile.aliyun_linux3
@@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ]
 RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/AliYun.repo;
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN for each_tag in `dnf --showduplicates list kernel-devel | grep kernel-devel | awk -c '{print $2}'`; do dnf -y install --downloadonly --downloaddir=/root/headers kernel-devel-$each_tag.x86_64; done
 RUN rpm --force -i /root/headers/*.rpm  || true
diff --git a/driver/dockerfiles.x86_64/Dockerfile.almalinux8 b/driver/dockerfiles.x86_64/Dockerfile.almalinux8
index 3372c02b7..70b1b6ccb 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.almalinux8
+++ b/driver/dockerfiles.x86_64/Dockerfile.almalinux8
@@ -4,6 +4,7 @@ CMD [ "sh", "-c", "echo start" ]
 RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/almalinux*.repo;
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 RUN cd /root/headers; \
diff --git a/driver/dockerfiles.x86_64/Dockerfile.almalinux9 b/driver/dockerfiles.x86_64/Dockerfile.almalinux9
index 89a9716e8..332faf384 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.almalinux9
+++ b/driver/dockerfiles.x86_64/Dockerfile.almalinux9
@@ -5,6 +5,7 @@ RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/almalinux*.repo;
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel openssl-devel; 
 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 WORKDIR /root/headers
diff --git a/driver/dockerfiles.x86_64/Dockerfile.anolis8 b/driver/dockerfiles.x86_64/Dockerfile.anolis8
index ed6e18cc6..d171938e6 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.anolis8
+++ b/driver/dockerfiles.x86_64/Dockerfile.anolis8
@@ -4,19 +4,20 @@ CMD [ "sh", "-c", "echo start" ]
 RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/almalinux*.repo;
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel; 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 RUN cd /root/headers; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/BaseOS/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/Plus/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/BaseOS/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/Plus/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/BaseOS/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/Plus/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/BaseOS/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/Plus/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/BaseOS/x86_64/os/Packages/'; \
- wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/Plus/x86_64/os/Packages/';
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/BaseOS/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.2/Plus/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/BaseOS/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.4/Plus/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/BaseOS/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.5/Plus/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/BaseOS/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.6/Plus/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/BaseOS/x86_64/os/Packages/'; \
+    wget -q -k -e robots=off  -c -r -np -nd -nH -A  'kernel-devel*x86_64.rpm' 'https://mirrors.openanolis.cn/anolis/8.8/Plus/x86_64/os/Packages/';
 
 RUN rpm --force -i /root/headers/*.rpm || true
 
diff --git a/driver/dockerfiles.x86_64/Dockerfile.ol8_uek b/driver/dockerfiles.x86_64/Dockerfile.ol8_uek
index 1c6335a3f..bb4bf685d 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.ol8_uek
+++ b/driver/dockerfiles.x86_64/Dockerfile.ol8_uek
@@ -3,6 +3,7 @@ FROM oraclelinux:8 AS rhel8
 RUN dnf install -y wget perl gcc make tree openssl-devel openssl gcc-toolset-11 gcc-toolset-11-binutils-devel binutils-devel gcc-toolset-11-elfutils-libelf-devel; 
 RUN dnf groupinstall -y  "Development Tools"; 
 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN dnf config-manager --set-enable ol8_UEKR7
 RUN dnf config-manager --set-enable ol8_UEKR6
diff --git a/driver/dockerfiles.x86_64/Dockerfile.oracle7 b/driver/dockerfiles.x86_64/Dockerfile.oracle7
index 1bf5e2cf3..c215c0f3f 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.oracle7
+++ b/driver/dockerfiles.x86_64/Dockerfile.oracle7
@@ -5,6 +5,7 @@ RUN yum update -y || true;
 RUN yum install -y wget perl gcc make tree openssl-devel openssl  binutils-devel elfutils-libelf-devel yumdownloader || true;
 RUN yum groupinstall -y  "Development Tools" || true;
 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN for eachversion in `yum --showduplicates list kernel-devel | grep kernel-devel.x86_64 | awk '{print $2}'` ; do yumdownloader  --destdir /root/headers kernel-devel-$eachversion.x86_64 || true ; done;
 RUN rpm --force -i --nodeps /root/headers/*.rpm || true
diff --git a/driver/dockerfiles.x86_64/Dockerfile.oracle8_uek b/driver/dockerfiles.x86_64/Dockerfile.oracle8_uek
index 86c4a6199..ff1132fd4 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.oracle8_uek
+++ b/driver/dockerfiles.x86_64/Dockerfile.oracle8_uek
@@ -3,6 +3,7 @@ FROM oraclelinux:8 AS oracle8
 
 RUN dnf install -y wget perl gcc make tree openssl-devel openssl gcc-toolset-11 gcc-toolset-11-binutils-devel binutils-devel gcc-toolset-11-elfutils-libelf-devel; 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN dnf config-manager --set-enable ol8_UEKR7
 RUN dnf config-manager --set-enable ol8_UEKR6
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel6 b/driver/dockerfiles.x86_64/Dockerfile.rhel6
index 92b83cca2..cfe2f5d22 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rhel6
+++ b/driver/dockerfiles.x86_64/Dockerfile.rhel6
@@ -2,15 +2,15 @@ FROM centos:centos6 AS rhel6
 
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN sed -e "s|^mirrorlist=|#mirrorlist=|g" \
-         -e "s|^#baseurl=http://mirror.centos.org/centos/\$releasever|baseurl=https://mirrors.aliyun.com/centos-vault/6.10|g" \
-         -i.bak \
-         /etc/yum.repos.d/CentOS-*.repo
+    -e "s|^#baseurl=http://mirror.centos.org/centos/\$releasever|baseurl=https://mirrors.aliyun.com/centos-vault/6.10|g" \
+    -i.bak \
+    /etc/yum.repos.d/CentOS-*.repo
 
 RUN yum install -y wget perl gcc make tree elfutils-libelf-devel unzip yum-utils; 
 RUN yum groupinstall -y  "Development Tools"; 
 
 RUN sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/*.repo
-
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 RUN for each_tag in `yum --showduplicates list kernel-devel | grep kernel-devel | awk  '{print $2}'`; do yumdownloader  --destdir /root/headers kernel-devel-$each_tag.x86_64; done
 
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel7 b/driver/dockerfiles.x86_64/Dockerfile.rhel7
index 8925e9506..9e461ad32 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rhel7
+++ b/driver/dockerfiles.x86_64/Dockerfile.rhel7
@@ -7,7 +7,7 @@ RUN yum install -y centos-release-scl
 RUN yum install -y devtoolset-8
 RUN yum install -y devtoolset-9
 RUN yum install -y devtoolset-10
-
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 ADD . /elkeid
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus b/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus
index 89a238c49..2dd58a4be 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus
+++ b/driver/dockerfiles.x86_64/Dockerfile.rhel7_centosplus
@@ -7,7 +7,7 @@ RUN yum install -y centos-release-scl
 RUN yum install -y devtoolset-8
 RUN yum install -y devtoolset-9
 RUN yum install -y devtoolset-10
-
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 ADD . /elkeid
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel8 b/driver/dockerfiles.x86_64/Dockerfile.rhel8
index 895767c78..1b7281774 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rhel8
+++ b/driver/dockerfiles.x86_64/Dockerfile.rhel8
@@ -2,6 +2,7 @@ FROM oraclelinux:8 AS rhel8
 
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel openssl-devel openssl; 
 RUN dnf groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 RUN for eachversion in `dnf --showduplicates list kernel-devel | grep kernel-devel.x86_64 | awk '{print $2}'` ; do dnf download --downloaddir=/root/headers kernel-devel-$eachversion.x86_64 || true ; done;
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus b/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus
index cfc7a6604..928567ea6 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus
+++ b/driver/dockerfiles.x86_64/Dockerfile.rhel8_plus
@@ -2,6 +2,7 @@ FROM cern/c8-base:latest AS rhel8
 
 RUN yum install -y wget perl gcc make tree elfutils-libelf-devel pciutils-libs; 
 RUN yum groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 RUN cd /root/headers; \
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rocky8 b/driver/dockerfiles.x86_64/Dockerfile.rocky8
index 9a0539a4c..e2d703f6e 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rocky8
+++ b/driver/dockerfiles.x86_64/Dockerfile.rocky8
@@ -2,6 +2,7 @@ FROM rockylinux:8 AS rockylinux8
 
 RUN yum install -y wget perl gcc make tree elfutils-libelf-devel; 
 RUN yum groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 WORKDIR /root/headers
diff --git a/driver/dockerfiles.x86_64/Dockerfile.rocky9 b/driver/dockerfiles.x86_64/Dockerfile.rocky9
index c0d40ff54..56e21852f 100644
--- a/driver/dockerfiles.x86_64/Dockerfile.rocky9
+++ b/driver/dockerfiles.x86_64/Dockerfile.rocky9
@@ -3,6 +3,7 @@ FROM rockylinux:9 AS rockylinux9
 RUN dnf install -y wget perl gcc make tree elfutils-libelf-devel openssl-devel; 
 
 RUN yum groupinstall -y  "Development Tools"; 
+RUN rm -rf /root/headers || true
 RUN mkdir /root/headers
 
 WORKDIR /root/headers