From e8bddbdccd5497d97ad91caacb14015841a05bca Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Wed, 31 Jan 2024 11:04:41 +0100 Subject: [PATCH] chore(images): more fixes. Signed-off-by: Federico Di Pierro --- images/aarch64/amazonlinux2/5.4/Dockerfile | 4 ++-- images/aarch64/amazonlinux2/5.4/Dockerfile.kernel | 4 ++-- images/aarch64/amazonlinux2022/5.15/Dockerfile | 4 ++-- images/aarch64/amazonlinux2022/5.15/Dockerfile.kernel | 4 ++-- images/x86_64/amazonlinux2/4.19/Dockerfile.kernel | 4 ++-- images/x86_64/amazonlinux2/5.10/Dockerfile.kernel | 4 ++-- images/x86_64/amazonlinux2/5.15/Dockerfile.kernel | 4 ++-- images/x86_64/amazonlinux2/5.4/Dockerfile.kernel | 4 ++-- images/x86_64/amazonlinux2022/5.15/Dockerfile.kernel | 4 ++-- images/x86_64/amazonlinux2023/6.1/Dockerfile.kernel | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/images/aarch64/amazonlinux2/5.4/Dockerfile b/images/aarch64/amazonlinux2/5.4/Dockerfile index f8286f8..757ac30 100644 --- a/images/aarch64/amazonlinux2/5.4/Dockerfile +++ b/images/aarch64/amazonlinux2/5.4/Dockerfile @@ -23,9 +23,9 @@ RUN yum install -y \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"/repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-headers-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-headers-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}/@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo sources.rpm ${URL}/@ && \ yum install -y ./*.rpm && \ rm -v ./*.rpm && \ diff --git a/images/aarch64/amazonlinux2/5.4/Dockerfile.kernel b/images/aarch64/amazonlinux2/5.4/Dockerfile.kernel index 93d392c..f9b4238 100644 --- a/images/aarch64/amazonlinux2/5.4/Dockerfile.kernel +++ b/images/aarch64/amazonlinux2/5.4/Dockerfile.kernel @@ -13,9 +13,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"/repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}/@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}/@ && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/aarch64/amazonlinux2022/5.15/Dockerfile b/images/aarch64/amazonlinux2022/5.15/Dockerfile index ec64dc3..2182368 100644 --- a/images/aarch64/amazonlinux2022/5.15/Dockerfile +++ b/images/aarch64/amazonlinux2022/5.15/Dockerfile @@ -22,9 +22,9 @@ RUN dnf groupinstall -y 'Development Tools' && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-headers-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-headers-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo sources.rpm ${URL}@ && \ dnf install -y ./*.rpm && \ rm -f ./*.rpm && \ diff --git a/images/aarch64/amazonlinux2022/5.15/Dockerfile.kernel b/images/aarch64/amazonlinux2022/5.15/Dockerfile.kernel index 3ae1df1..c8af74e 100644 --- a/images/aarch64/amazonlinux2022/5.15/Dockerfile.kernel +++ b/images/aarch64/amazonlinux2022/5.15/Dockerfile.kernel @@ -13,9 +13,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}@ && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/x86_64/amazonlinux2/4.19/Dockerfile.kernel b/images/x86_64/amazonlinux2/4.19/Dockerfile.kernel index a6e8e0a..cab6033 100644 --- a/images/x86_64/amazonlinux2/4.19/Dockerfile.kernel +++ b/images/x86_64/amazonlinux2/4.19/Dockerfile.kernel @@ -15,9 +15,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"/repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}/@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}/@ && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/x86_64/amazonlinux2/5.10/Dockerfile.kernel b/images/x86_64/amazonlinux2/5.10/Dockerfile.kernel index 257067f..5d74600 100644 --- a/images/x86_64/amazonlinux2/5.10/Dockerfile.kernel +++ b/images/x86_64/amazonlinux2/5.10/Dockerfile.kernel @@ -15,9 +15,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"/repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}/@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}/@ && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/x86_64/amazonlinux2/5.15/Dockerfile.kernel b/images/x86_64/amazonlinux2/5.15/Dockerfile.kernel index dea737f..d5e9207 100644 --- a/images/x86_64/amazonlinux2/5.15/Dockerfile.kernel +++ b/images/x86_64/amazonlinux2/5.15/Dockerfile.kernel @@ -15,9 +15,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"/repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}/@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}/@ && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/x86_64/amazonlinux2/5.4/Dockerfile.kernel b/images/x86_64/amazonlinux2/5.4/Dockerfile.kernel index ae9fe69..47a7249 100644 --- a/images/x86_64/amazonlinux2/5.4/Dockerfile.kernel +++ b/images/x86_64/amazonlinux2/5.4/Dockerfile.kernel @@ -15,9 +15,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"/repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}/@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm ${URL}/@ && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/x86_64/amazonlinux2022/5.15/Dockerfile.kernel b/images/x86_64/amazonlinux2022/5.15/Dockerfile.kernel index b8e9b26..652f9bf 100644 --- a/images/x86_64/amazonlinux2022/5.15/Dockerfile.kernel +++ b/images/x86_64/amazonlinux2022/5.15/Dockerfile.kernel @@ -15,9 +15,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm "${URL}@" && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \ diff --git a/images/x86_64/amazonlinux2023/6.1/Dockerfile.kernel b/images/x86_64/amazonlinux2023/6.1/Dockerfile.kernel index 640a065..d4f9639 100644 --- a/images/x86_64/amazonlinux2023/6.1/Dockerfile.kernel +++ b/images/x86_64/amazonlinux2023/6.1/Dockerfile.kernel @@ -15,9 +15,9 @@ RUN touch .placeholder && \ URL=$(cat mirror.list) && \ curl -sLO "${URL}"repodata/primary.xml.gz && \ gunzip primary.xml.gz && \ - grep -E 'kernel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo kernel.rpm ${URL}@ && \ - grep -E 'kernel-devel-'${VERSION}'.rpm' primary.xml | grep href | cut -d\" -f2 | \ + grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \ xargs -I@ curl -Lo headers.rpm "${URL}@" && \ rpm2cpio kernel.rpm > kernel.cpio && \ rpm2cpio headers.rpm > headers.cpio && \