fix(images): install correct AWS linux-{headers,tools} on ubuntu

The current installation method for AWS linux headers and tools is
based on downloading them from `ports.ubuntu.com` or
`archive.ubuntu.com`, and then installing them with `dpkg -i`.
Unfortunately, the current implementation doesn't work, because
AWS headers are split into two packages: for example, headers for
kernel `6.5.0-1024-aws` are split into
`linux-headers-6.5.0-1024-aws` and
`linux-aws-6.5-headers-6.5.0-1024`; both must be installed in order
for anything using headers to work. Fix this headers and tools
using directly the package manager.

Signed-off-by: Leonardo Di Giovanna <[email protected]>

Author: ekoops

images/aarch64/ubuntu/6.5/Dockerfile

@@ -1,7 +1,6 @@
 FROM ubuntu:22.04
 
 ARG VERSION=6.5.0-1024-aws
-ARG URL='https://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux-aws-6.5/'
 ARG CMAKE_VERSION
 
 # Use bash for all RUN steps with some safety options enabled.
@@ -20,6 +19,8 @@ RUN apt-get update && apt-get install -y \
 		kmod \
 		libcap-dev \
 		libelf-dev \
+		linux-headers-${VERSION} \
+		linux-tools-${VERSION} \
 		llvm \
 		net-tools \
 		openssh-server \
@@ -31,13 +32,6 @@ RUN apt-get update && apt-get install -y \
 		wget && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/* && \
-	curl ${URL} | \
-		grep -E "linux-headers-${VERSION}|linux-tools-${VERSION}" | \
-		grep "arm64" | \
-		cut -d\" -f8 | \
-		xargs -I@ curl -LO ${URL}@ && \
-	find . -name '*.deb' | xargs -n1 dpkg -i --force-depends && \
-	rm -f *.deb && \
 	CMAKE_ARCH="aarch64" && \
 	CMAKE_RELEASE_NAME="cmake-${CMAKE_VERSION}-linux-${CMAKE_ARCH}" && \
 	curl -L "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_RELEASE_NAME}.tar.gz" | \

images/x86_64/ubuntu/4.15/Dockerfile

@@ -1,7 +1,6 @@
 FROM ubuntu:18.04
 
 ARG VERSION=4.15.0-1118-aws
-ARG URL='https://archive.ubuntu.com/ubuntu/pool/main/l/linux-aws/'
 ARG CMAKE_VERSION
 
 # Use bash for all RUN steps with some safety options enabled.
@@ -20,6 +19,8 @@ RUN apt-get update && apt-get install -y \
 		kmod \
 		libcap-dev \
 		libelf-dev \
+		linux-headers-${VERSION} \
+		linux-tools-${VERSION} \
 		llvm \
 		net-tools \
 		openssh-server \
@@ -31,13 +32,6 @@ RUN apt-get update && apt-get install -y \
 		wget && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/* && \
-	curl ${URL} | \
-		grep -E "linux-headers-${VERSION}|linux-tools-${VERSION}|linux-tools-common_${VERSION}" | \
-		grep -vE 'i386|lowlatency' | \
-		cut -d\" -f8 | \
-		xargs -I@ curl -LO ${URL}@ && \
-	find . -name '*.deb' | xargs -n1 dpkg -i --force-depends && \
-	rm -f *.deb && \
 	CMAKE_ARCH="x86_64" && \
 	CMAKE_RELEASE_NAME="cmake-${CMAKE_VERSION}-linux-${CMAKE_ARCH}" && \
 	curl -L "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_RELEASE_NAME}.tar.gz" | \

images/x86_64/ubuntu/6.2/Dockerfile

@@ -1,7 +1,6 @@
 FROM ubuntu:22.04
 
 ARG VERSION=6.2.0-1018-aws
-ARG URL='https://archive.ubuntu.com/ubuntu/pool/main/l/linux-aws-6.2/'
 ARG CMAKE_VERSION
 
 # Use bash for all RUN steps with some safety options enabled.
@@ -20,6 +19,8 @@ RUN apt-get update && apt-get install -y \
 		kmod \
 		libcap-dev \
 		libelf-dev \
+		linux-headers-${VERSION} \
+		linux-tools-${VERSION} \
 		llvm \
 		net-tools \
 		openssh-server \
@@ -30,12 +31,7 @@ RUN apt-get update && apt-get install -y \
 		udev \
 		wget && \
 	apt-get clean && \
-	curl ${URL} | \
-		grep -E "linux-headers-${VERSION}|linux-tools-${VERSION}|linux-tools-common_${VERSION}" | \
-		cut -d\" -f8 | \
-		xargs -I@ curl -LO ${URL}@ && \
-		find . -name '*.deb' | xargs -n1 dpkg -i --force-depends && \
-		rm -f *.deb && \
+	rm -rf /var/lib/apt/lists/* && \
 	CMAKE_ARCH="x86_64" && \
 	CMAKE_RELEASE_NAME="cmake-${CMAKE_VERSION}-linux-${CMAKE_ARCH}" && \
 	curl -L "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_RELEASE_NAME}.tar.gz" | \

images/x86_64/ubuntu/6.5/Dockerfile

@@ -1,7 +1,6 @@
 FROM ubuntu:22.04
 
 ARG VERSION=6.5.0-1024-aws
-ARG URL='https://archive.ubuntu.com/ubuntu/pool/main/l/linux-aws-6.5/'
 ARG CMAKE_VERSION
 
 # Use bash for all RUN steps with some safety options enabled.
@@ -20,6 +19,8 @@ RUN apt-get update && apt-get install -y \
 		kmod \
 		libcap-dev \
 		libelf-dev \
+		linux-headers-${VERSION} \
+		linux-tools-${VERSION} \
 		llvm \
 		net-tools \
 		openssh-server \
@@ -31,12 +32,6 @@ RUN apt-get update && apt-get install -y \
 		wget && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/* && \
-	curl ${URL} | \
-		grep -E "linux-headers-${VERSION}|linux-tools-${VERSION}|linux-tools-common_${VERSION}" | \
-		cut -d\" -f8 | \
-		xargs -I@ curl -LO ${URL}@ && \
-	find . -name '*.deb' | xargs -n1 dpkg -i --force-depends && \
-	rm -f *.deb && \
 	CMAKE_ARCH="x86_64" && \
 	CMAKE_RELEASE_NAME="cmake-${CMAKE_VERSION}-linux-${CMAKE_ARCH}" && \
 	curl -L "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_RELEASE_NAME}.tar.gz" | \