Update to Jammy in rebuild.sh and stop unnecessarily installing Lin…

…ux headers
libbpf · Jan 8, 2023 · 3d75000 · 3d75000
1 parent 62745f0
commit 3d75000
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,6 @@ jobs:
           sudo apt-get install \
               build-essential \
               libelf-dev:${{ matrix.os-arch }} \
-              linux-headers-generic:${{ matrix.os-arch }} \
               zlib1g-dev:${{ matrix.os-arch }}
 
       - name: Install libbpf-dev

diff --git a/rebuild.sh b/rebuild.sh
@@ -5,7 +5,7 @@ DOCKER="docker"
 set -eu -o pipefail
 
 ${DOCKER} build -t libbpf-sys-builder - <<'EOF'
-FROM amd64/ubuntu:focal AS libbpf-sys-builder
+FROM amd64/ubuntu:jammy AS libbpf-sys-builder
 
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
@@ -18,7 +18,7 @@ SHELL ["/bin/bash", "-eu", "-o", "pipefail", "-c"]
 RUN \
 	export DEBIAN_FRONTEND=noninteractive; \
 	apt-get -q update; \
-	apt-get -q install -y curl build-essential linux-headers-generic zlib1g-dev libelf-dev libclang-dev llvm clang pkg-config; \
+	apt-get -q install -y curl build-essential zlib1g-dev libelf-dev libclang-dev llvm clang pkg-config; \
 	apt-get -q clean autoclean;
 
 RUN \