Skip to content

Commit

Permalink
feat: [NODE-1509] Use 6.11 kernel on 24.04 for GuestOS (#2165)
Browse files Browse the repository at this point in the history
This will be merged to create new base images, then reverted until
further testing has completed.
  • Loading branch information
Bownairo authored Oct 22, 2024
1 parent 0fadddd commit 56c609e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
22 changes: 22 additions & 0 deletions ic-os/guestos/context/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ RUN cd /tmp/ && \
echo "fbadb376afa7c883f87f70795700a8a200f7fd45412532cc1938a24d41078011 node_exporter-1.8.1.linux-amd64.tar.gz" > node_exporter.sha256 && \
shasum -c node_exporter.sha256

# Download 6.11 kernel and modules
RUN cd /tmp/ && \
curl -L -O http://mirrors.kernel.org/ubuntu/pool/main/l/linux/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
curl -L -O http://mirrors.kernel.org/ubuntu/pool/main/l/linux-signed/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
curl -L -O http://mirrors.kernel.org/ubuntu/pool/main/l/linux-meta/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb && \
echo "d4cd2d97fcca81b57bec947b0e8ca004d556afce1d13f5cebe5d677c0445c6a2 linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb" >> kernel.sha256 && \
echo "241811191691c68e0874519ee71bda9de39e23510dee5e5512150db874f5b285 linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb" >> kernel.sha256 && \
echo "5c31c7e0d996ebc0928c5e1ad3b80fea047b56dfbbdaa759f7e7a70b1c42f10e linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb" >> kernel.sha256 && \
shasum -c kernel.sha256

#
# Second build stage:
Expand Down Expand Up @@ -81,3 +90,16 @@ RUN cd /tmp/ && \
mkdir -p /etc/node_exporter && \
tar --strip-components=1 -C /usr/local/bin/ -zvxf node_exporter-1.8.1.linux-amd64.tar.gz node_exporter-1.8.1.linux-amd64/node_exporter && \
rm /tmp/node_exporter-1.8.1.linux-amd64.tar.gz

# Install 6.11 kernel
COPY --from=download /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb
COPY --from=download /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb
COPY --from=download /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb

RUN cd /tmp/ && \
dpkg -i /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
dpkg -i /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
dpkg -i /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb && \
rm /tmp/linux-modules-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
rm /tmp/linux-image-6.11.0-8-generic_6.11.0-8.8_amd64.deb && \
rm /tmp/linux-image-virtual-hwe-24.04_6.11.0-8.8_amd64.deb
6 changes: 5 additions & 1 deletion ic-os/guestos/context/packages.common
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
# image only.

# Need kernel to boot anything
linux-image-virtual-hwe-24.04
initramfs-tools

# Resolve some dependencies manualy for 6.11
kmod
linux-base
wireless-regdb

# Need systemd for boot process
systemd
systemd-sysv
Expand Down

0 comments on commit 56c609e

Please sign in to comment.