From a5bfe334cb25a54444e3f0a8ea6a208300dc9e51 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Thu, 6 Apr 2023 20:53:59 +0000 Subject: [PATCH] Install both headers and image --- kernel.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel.go b/kernel.go index 8afea49..52b530e 100644 --- a/kernel.go +++ b/kernel.go @@ -305,8 +305,9 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand, d += "RUN apt-get update\n" d += "RUN apt-get install -y build-essential libelf-dev\n" d += "RUN apt-get install -y wget git\n" - // Install a single kernel to ensure all dependencies are cached - d += "RUN apt-get install -y $(apt-cache search --names-only '^linux-headers-[0-9\\.\\-]*-generic' | awk '{ print $1 }' | head -n 1)\n" + // Install a single kernel and headers to ensure all dependencies are cached + d += "RUN PKGNAME=$(apt-cache search --names-only '^linux-headers-[0-9\\.\\-]*-generic' | awk '{ print $1 }' | head -n 1) " + + "apt-get install -y $PKGNAME $(echo $PKGNAME | sed 's/headers/image/')\n" if sk.DistroRelease >= "14.04" { d += "RUN apt-get install -y libseccomp-dev\n" }