From 8734ce0e36989d4793dd16c34a7047776dcab1ba Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Fri, 22 Nov 2024 14:26:40 +0800 Subject: [PATCH 1/4] [fix]: base image elfutils version issue Signed-off-by: Sam Yuan --- build/Dockerfile.builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile.builder b/build/Dockerfile.builder index ed2cb08409..0651f0fbe2 100644 --- a/build/Dockerfile.builder +++ b/build/Dockerfile.builder @@ -8,7 +8,7 @@ RUN yum-config-manager --enable ubi-9-baseos-source WORKDIR /elfutils-source RUN yumdownloader --source elfutils RUN yum -y install cpio -RUN rpm2cpio elfutils-0.190-2.el9.src.rpm | cpio -iv +RUN rpm2cpio elfutils-0.191-4.el9.src.rpm | cpio -iv RUN tar xjvf elfutils-0.190.tar.bz2 WORKDIR /elfutils-source/elfutils-0.190 RUN ./configure --disable-debuginfod From c03a5d1125dd1b439a4c39f023733db8a1dc9fa5 Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Fri, 22 Nov 2024 14:35:20 +0800 Subject: [PATCH 2/4] [fix]: missing base image check in CI Signed-off-by: Sam Yuan --- .github/workflows/pull_request.yml | 14 ++++++++++++-- build/Dockerfile.builder | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6355227ee7..8589c309f8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -55,13 +55,23 @@ jobs: changes_baseimage: runs-on: ubuntu-latest outputs: - src: ${{ steps.changes.outputs.src }} + src: ${{ steps.changes_baseimage.outputs.src }} steps: - uses: actions/checkout@v4 - uses: dorny/paths-filter@v3 - id: changes + id: changes_baseimage with: filters: | src: - './.github/workflows/image_base.yml' - './build/Dockerfile.builder' + + base_image: + needs: changes_baseimage + if: ${{ needs.changes_baseimage.outputs.src == 'true' }} + uses: ./.github/workflows/image_base.yml + with: + pushImage: false + secrets: + username: ${{ secrets.BOT_NAME }} + password: ${{ secrets.BOT_TOKEN }} diff --git a/build/Dockerfile.builder b/build/Dockerfile.builder index 0651f0fbe2..0e74b01bf8 100644 --- a/build/Dockerfile.builder +++ b/build/Dockerfile.builder @@ -9,8 +9,8 @@ WORKDIR /elfutils-source RUN yumdownloader --source elfutils RUN yum -y install cpio RUN rpm2cpio elfutils-0.191-4.el9.src.rpm | cpio -iv -RUN tar xjvf elfutils-0.190.tar.bz2 -WORKDIR /elfutils-source/elfutils-0.190 +RUN tar xjvf elfutils-0.191.tar.bz2 +WORKDIR /elfutils-source/elfutils-0.191 RUN ./configure --disable-debuginfod RUN make install From d0cc8c0dce7d8bdfb71f69f473be126de6a3d54e Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Fri, 22 Nov 2024 14:43:00 +0800 Subject: [PATCH 3/4] [fix]: libbpf version upgrade in base image Signed-off-by: Sam Yuan --- build/Dockerfile.builder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile.builder b/build/Dockerfile.builder index 0e74b01bf8..104f3bb685 100644 --- a/build/Dockerfile.builder +++ b/build/Dockerfile.builder @@ -14,10 +14,10 @@ WORKDIR /elfutils-source/elfutils-0.191 RUN ./configure --disable-debuginfod RUN make install - +#libbpf-1.4.0-1.el9.src.rpm WORKDIR /libbpf-source RUN yumdownloader --source libbpf -RUN rpm2cpio libbpf-1.3.0-2.el9.src.rpm | cpio -iv +RUN rpm2cpio libbpf-1.4.0-1.el9.src.rpm | cpio -iv RUN tar xf ./linux-*el9.tar.xz WORKDIR /libbpf-source/linux-5.14.0-424.el9/tools/lib/bpf RUN make install_headers From bbde61e90c0f416b5a475f017d7a44a0f48891a5 Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Fri, 22 Nov 2024 14:51:13 +0800 Subject: [PATCH 4/4] [fix]: update libbpf version Signed-off-by: Sam Yuan --- build/Dockerfile.builder | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/Dockerfile.builder b/build/Dockerfile.builder index 104f3bb685..aa182d97cb 100644 --- a/build/Dockerfile.builder +++ b/build/Dockerfile.builder @@ -14,15 +14,14 @@ WORKDIR /elfutils-source/elfutils-0.191 RUN ./configure --disable-debuginfod RUN make install -#libbpf-1.4.0-1.el9.src.rpm WORKDIR /libbpf-source RUN yumdownloader --source libbpf RUN rpm2cpio libbpf-1.4.0-1.el9.src.rpm | cpio -iv RUN tar xf ./linux-*el9.tar.xz -WORKDIR /libbpf-source/linux-5.14.0-424.el9/tools/lib/bpf +WORKDIR /libbpf-source/linux-5.14.0-473.el9/tools/lib/bpf RUN make install_headers RUN prefix=/usr BUILD_STATIC_ONLY=y make install -WORKDIR /libbpf-source/linux-5.14.0-424.el9/tools/bpf +WORKDIR /libbpf-source/linux-5.14.0-473.el9/tools/bpf RUN make bpftool # rpmautospec requires epel-release