Skip to content

Commit

Permalink
chore(images): more fixes.
Browse files Browse the repository at this point in the history 
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
  • Loading branch information
@FedeDP
FedeDP committed Jan 31, 2024
1 parent c7f093e commit 51ad010
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 47 deletions.
10 changes: 5 additions & 5 deletions images/aarch64/amazonlinux2/5.4/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG VERSION=5.4.247-162
ARG VERSION=5.4.247-162.350
ARG URL='http://amazonlinux.us-east-1.amazonaws.com/2/extras/kernel-5.4/latest/aarch64'

RUN yum install -y \
Expand All @@ -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 && \
Expand All @@ -37,8 +37,8 @@ RUN yum install -y \
rm -vf cmake-3.19.8-Linux-aarch64.tar.gz && \
mv cmake-3.19.8-Linux-aarch64 /opt/cmake-3.19.8 && \
ln -sf /opt/cmake-3.19.8/bin/* /usr/bin/ && \
mkdir -p /lib/modules/${VERSION}.350.amzn2.aarch64/ && \
ln -s /usr/src/kernels/${VERSION}.350.amzn2.aarch64/ /lib/modules/${VERSION}.350.amzn2.aarch64/build && \
mkdir -p /lib/modules/${VERSION}.amzn2.aarch64/ && \
ln -s /usr/src/kernels/${VERSION}.amzn2.aarch64/ /lib/modules/${VERSION}.amzn2.aarch64/build && \
rm -vf /usr/bin/gcc /usr/bin/g++ && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc10-gcc 100 --slave /usr/bin/g++ g++ /usr/bin/gcc10-c++ && \
update-alternatives --auto gcc && \
Expand Down
13 changes: 8 additions & 5 deletions images/aarch64/amazonlinux2/5.4/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
ARG VERSION=5.4.247-162.350
ARG URL='http://amazonlinux.us-east-1.amazonaws.com/2/extras/kernel-5.4/latest/aarch64'

FROM initrd-builder:0.0.1 AS stage1

ARG VERSION=5.4.247-162
ARG URL='http://amazonlinux.us-east-1.amazonaws.com/2/extras/kernel-5.4/latest/aarch64'
ARG VERSION
ARG URL

WORKDIR /home/ubuntu

Expand All @@ -10,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 && \
Expand All @@ -35,7 +38,7 @@ COPY --from=stage1 /opt/initrd-builder/* /opt/initrd-builder/
RUN yum groupinstall -y 'Development Tools' && \
cp -v /opt/initrd-builder/Makefile.virtio_mmio Makefile && \
curl -LO 'https://raw.githubusercontent.com/torvalds/linux/v5.4/drivers/virtio/virtio_mmio.c' && \
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.350.amzn2.aarch64/" make
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.amzn2.aarch64/" make

FROM initrd-builder:0.0.1 AS stage2
COPY --from=stage1 /home/ubuntu/extracted /home/ubuntu/extracted/
Expand Down
10 changes: 5 additions & 5 deletions images/aarch64/amazonlinux2022/5.15/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2022

ARG VERSION=5.15.73-45
ARG VERSION=5.15.73-45.135
ARG URL='https://al2022-repos-us-east-1-9761ab97.s3.dualstack.us-east-1.amazonaws.com/core/mirrors/latest/aarch64'


Expand All @@ -22,14 +22,14 @@ 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 && \
mkdir -p /lib/modules/${VERSION}.135.amzn2022.aarch64/ && \
ln -s /usr/src/kernels/${VERSION}.135.amzn2022.aarch64/ /lib/modules/${VERSION}.135.amzn2022.aarch64/build && \
mkdir -p /lib/modules/${VERSION}.amzn2022.aarch64/ && \
ln -s /usr/src/kernels/${VERSION}.amzn2022.aarch64/ /lib/modules/${VERSION}.amzn2022.aarch64/build && \
sed -i -e 's/^AcceptEnv LANG LC_\*$/#AcceptEnv LANG LC_*/' /etc/ssh/sshd_config && \
echo 'UseDNS no' >> /etc/ssh/sshd_config && \
echo "root:root" | chpasswd
13 changes: 8 additions & 5 deletions images/aarch64/amazonlinux2022/5.15/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
ARG VERSION=5.15.73-45.135
ARG URL='https://al2022-repos-us-east-1-9761ab97.s3.dualstack.us-east-1.amazonaws.com/core/mirrors/latest/aarch64'

FROM initrd-builder:0.0.1 AS stage1

ARG VERSION=5.15.73-45
ARG URL='https://al2022-repos-us-east-1-9761ab97.s3.dualstack.us-east-1.amazonaws.com/core/mirrors/latest/aarch64'
ARG VERSION
ARG URL

WORKDIR /home/ubuntu

Expand All @@ -10,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 && \
Expand All @@ -36,7 +39,7 @@ COPY --from=stage1 /opt/initrd-builder/* /opt/initrd-builder/
RUN dnf groupinstall -y 'Development Tools' && \
cp -v /opt/initrd-builder/Makefile.virtio_mmio Makefile && \
curl -LO 'https://raw.githubusercontent.com/torvalds/linux/v5.15/drivers/virtio/virtio_mmio.c' && \
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.135.amzn2022.aarch64/" make
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.amzn2022.aarch64/" make

FROM initrd-builder:0.0.1 AS stage2
COPY --from=stage1 /home/ubuntu/extracted /home/ubuntu/extracted/
Expand Down
9 changes: 7 additions & 2 deletions images/aarch64/fedora/6.2/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
FROM initrd-builder:0.0.1 AS stage1

ARG VERSION=6.2.9-300
ARG HVERSION=6.2.6-300
ARG ARCH=aarch64
ARG URL='https://mirrors.kernel.org/fedora/releases/38/Everything/aarch64/os/Packages/k/'

FROM initrd-builder:0.0.1 AS stage1

ARG VERSION
ARG HVERSION
ARG ARCH
ARG URL

WORKDIR /home/ubuntu

RUN touch .placeholder && \
Expand Down
7 changes: 5 additions & 2 deletions images/aarch64/oraclelinux/4.14/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM initrd-builder:0.0.1 AS stage1

ARG VERSION=4.14.35-2047.527.2
ARG URL='https://yum.oracle.com/repo/OracleLinux/OL7/latest/aarch64'

FROM initrd-builder:0.0.1 AS stage1

ARG VERSION
ARG URL

WORKDIR /home/ubuntu

RUN touch .placeholder && \
Expand Down
8 changes: 6 additions & 2 deletions images/aarch64/oraclelinux/5.15/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
FROM initrd-builder:0.0.1 AS stage1

ARG VERSION=5.15.0-8.91.4.1
ARG URL='https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/aarch64'
ARG ARCH='aarch64'

FROM initrd-builder:0.0.1 AS stage1

ARG VERSION
ARG ARCH
ARG URL

WORKDIR /home/ubuntu

RUN touch .placeholder && \
Expand Down
4 changes: 2 additions & 2 deletions images/x86_64/amazonlinux2/4.19/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions images/x86_64/amazonlinux2/5.10/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions images/x86_64/amazonlinux2/5.15/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions images/x86_64/amazonlinux2/5.4/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 4 additions & 4 deletions images/x86_64/amazonlinux2022/5.15/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=5.15.73-45
ARG VERSION=5.15.73-45.135
ARG URL='https://al2022-repos-us-east-1-9761ab97.s3.dualstack.us-east-1.amazonaws.com/core/mirrors/latest/x86_64'
ARG ARCH=x86_64

Expand All @@ -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 && \
Expand All @@ -41,7 +41,7 @@ COPY --from=stage1 /opt/initrd-builder/* /opt/initrd-builder/
RUN dnf groupinstall -y 'Development Tools' && \
cp -v /opt/initrd-builder/Makefile.virtio_mmio Makefile && \
curl -LO 'https://raw.githubusercontent.com/torvalds/linux/v5.15/drivers/virtio/virtio_mmio.c' && \
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.135.amzn2022.${ARCH}/" make
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.amzn2022.${ARCH}/" make

FROM initrd-builder:0.0.1 AS stage2
COPY --from=stage1 /home/ubuntu/extracted /home/ubuntu/extracted/
Expand Down
8 changes: 4 additions & 4 deletions images/x86_64/amazonlinux2023/6.1/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=6.1.34-58
ARG VERSION=6.1.34-58.102
ARG URL='https://cdn.amazonlinux.com/al2023/core/mirrors/latest/x86_64'
ARG ARCH=x86_64

Expand All @@ -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 && \
Expand All @@ -41,7 +41,7 @@ COPY --from=stage1 /opt/initrd-builder/* /opt/initrd-builder/
RUN dnf groupinstall -y 'Development Tools' && \
cp -v /opt/initrd-builder/Makefile.virtio_mmio Makefile && \
curl -LO 'https://raw.githubusercontent.com/torvalds/linux/v6.1/drivers/virtio/virtio_mmio.c' && \
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.102.amzn2023.${ARCH}/" make
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.amzn2023.${ARCH}/" make

FROM initrd-builder:0.0.1 AS stage2
COPY --from=stage1 /home/ubuntu/extracted /home/ubuntu/extracted/
Expand Down
6 changes: 3 additions & 3 deletions images/x86_64/centos/3.10/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ RUN yum groupinstall -y 'Development Tools' && \
cp -v /opt/initrd-builder/Makefile.virtio_mmio Makefile && \
mkdir src && \
cd src && \
curl -Lo source.rpm 'https://archive.kernel.org/centos-vault/7.9.2009/os/Source/SPackages/kernel-${VERSION}.el7.src.rpm' && \
curl -Lo source.rpm 'https://archive.kernel.org/centos-vault/7.9.2009/os/Source/SPackages/kernel-'${VERSION}'.el7.src.rpm' && \
rpm2cpio source.rpm > source.cpio && \
cpio -idmv < source.cpio && \
tar -xaf 'linux-${VERSION}.el7.tar.xz' && \
tar -xaf 'linux-'${VERSION}'.el7.tar.xz' && \
cd .. && \
find src -name 'virtio_mmio.c' -exec cp -v {} . \; && \
KERNEL_DIR='/home/ubuntu/extracted/usr/src/kernels/${VERSION}.el7.${ARCH}/' make
KERNEL_DIR="/home/ubuntu/extracted/usr/src/kernels/${VERSION}.el7.${ARCH}/" make

FROM initrd-builder:0.0.1 AS stage2
COPY --from=stage1 /home/ubuntu/extracted /home/ubuntu/extracted/
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/oraclelinux/2.6/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN yum groupinstall -y 'Development Tools' && \
yum install -y gcc && \
mkdir src && \
cd src && \
curl -Lo source.rpm 'https://oss.oracle.com/ol6/SRPMS-updates/kernel-uek-${VERSION}.el6uek.src.rpm' && \
curl -Lo source.rpm 'https://oss.oracle.com/ol6/SRPMS-updates/kernel-uek-'${VERSION}'.el6uek.src.rpm' && \
rpm2cpio source.rpm > source.cpio && \
cpio -idmv < ./source.cpio && \
tar -xaf linux-2.6.*.tar.bz2 && \
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/oraclelinux/3.10/Dockerfile.kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN yum groupinstall -y 'Development Tools' && \
yum install -y gcc elfutils-libelf-devel && \
mkdir src && \
cd src && \
curl -Lo source.rpm 'https://oss.oracle.com/ol7/SRPMS-updates/kernel-${VERSION}.el7.src.rpm' && \
curl -Lo source.rpm 'https://oss.oracle.com/ol7/SRPMS-updates/kernel-'${VERSION}'.el7.src.rpm' && \
rpm2cpio source.rpm > source.cpio && \
cpio -idmv < ./source.cpio && \
tar -xaf linux-3.10.*.tar.xz && \
Expand Down

0 comments on commit 51ad010

Please sign in to comment.