fix(images): drop bpftool dep from images since it is only used by …

…modernbpf-builder now. Signed-off-by: Federico Di Pierro <[email protected]>
falcosecurity · Dec 6, 2023 · 16fe946 · 16fe946
1 parent dfad3b1
commit 16fe946
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 21 deletions.
diff --git a/images/aarch64/amazonlinux2022/5.15/Dockerfile b/images/aarch64/amazonlinux2022/5.15/Dockerfile
@@ -26,8 +26,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  xargs -I@ curl -Lo headers.rpm ${URL}@ && \
  grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \
  xargs -I@ curl -Lo sources.rpm ${URL}@ && \
- grep -E 'bpftool-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \
- xargs -I@ curl -Lo bpftool.rpm ${URL}@ && \
  dnf install -y ./*.rpm && \
  rm -f ./*.rpm && \
  mkdir -p /lib/modules/5.15.73-45.135.amzn2022.aarch64/ && \

diff --git a/images/aarch64/fedora/6.2/Dockerfile b/images/aarch64/fedora/6.2/Dockerfile
@@ -15,7 +15,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  openssh-server \
  rsync \
  systemd && \
- curl -Lo bpftool.rpm ${URL}/b/bpftool-${HVERSION}.fc38.${ARCH}.rpm && \
  curl -Lo sources.rpm ${URL}/k/kernel-devel-${VERSION}.fc38.${ARCH}.rpm && \
  curl -Lo headers.rpm ${URL}/k/kernel-headers-${HVERSION}.fc38.${ARCH}.rpm && \
  dnf install -y ./*.rpm && \

diff --git a/images/aarch64/oraclelinux/5.15/Dockerfile b/images/aarch64/oraclelinux/5.15/Dockerfile
@@ -21,8 +21,7 @@ RUN yum install -y \
  curl -L -o kernel.rpm ${URL}/getPackage/kernel-uek-core-${VERSION}.el9uek.${ARCH}.rpm && \
  curl -L -o devel.rpm ${URL}/getPackage/kernel-uek-devel-${VERSION}.el9uek.${ARCH}.rpm && \
  curl -L -o modules.rpm ${URL}/getPackage/kernel-uek-modules-${VERSION}.el9uek.${ARCH}.rpm && \
- curl -L -o bpftool.rpm ${URL}/getPackage/bpftool-${VERSION}.el9uek.${ARCH}.rpm && \
- yum install -y ./kernel.rpm ./devel.rpm ./modules.rpm ./bpftool.rpm && \
+ yum install -y ./kernel.rpm ./devel.rpm ./modules.rpm && \
  sed -i -e 's/^AcceptEnv LANG LC_\*$/#AcceptEnv LANG LC_*/' /etc/ssh/sshd_config && \
  echo "root:root" | chpasswd && \
  echo 'UseDNS no' >> /etc/ssh/sshd_config && \

diff --git a/images/aarch64/ubuntu/6.3/Dockerfile b/images/aarch64/ubuntu/6.3/Dockerfile
@@ -43,7 +43,6 @@ RUN apt-get update && apt-get install -y \
  xargs -I@ curl -LO ${URL}@ && \
  find . -name '*.deb' | xargs -n1 dpkg -i --force-depends && \
  rm -f *.deb && \
- find /usr/lib/linux-tools/ -name bpftool -exec ln -s {} /usr/bin/bpftool \; && \
  sed -ie '/^ConditionVirtualization.*/d' /lib/systemd/system/systemd-timesyncd.service && \
  echo "" > /etc/machine-id && echo "" > /var/lib/dbus/machine-id && \
  sed -i -e 's/^AcceptEnv LANG LC_\*$/#AcceptEnv LANG LC_*/' /etc/ssh/sshd_config && \

diff --git a/images/x86_64/amazonlinux2022/5.15/Dockerfile b/images/x86_64/amazonlinux2022/5.15/Dockerfile
@@ -25,8 +25,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  xargs -I@ curl -Lo headers.rpm ${URL}@ && \
  grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \
  xargs -I@ curl -Lo sources.rpm ${URL}@ && \
- grep -E 'bpftool-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \
- xargs -I@ curl -Lo bpftool.rpm ${URL}@ && \
  dnf install -y ./*.rpm && \
  rm -vf ./*.rpm && \
  dnf clean all && \

diff --git a/images/x86_64/amazonlinux2023/6.1/Dockerfile b/images/x86_64/amazonlinux2023/6.1/Dockerfile
@@ -25,10 +25,8 @@ RUN dnf groupinstall -y 'Development Tools' && \
  xargs -I@ curl -Lo headers.rpm ${URL}@ && \
  grep -E 'kernel-devel-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \
  xargs -I@ curl -Lo sources.rpm ${URL}@ && \
- grep -E 'bpftool-'${VERSION}'.*.rpm' primary.xml | grep href | cut -d\" -f2 | \
- xargs -I@ curl -Lo bpftool.rpm ${URL}@ && \
- dnf install -y ./headers.rpm ./bpftool.rpm ./sources.rpm && \
- rm -vf ./headers.rpm ./bpftool.rpm ./sources.rpm && \
+ dnf install -y ./headers.rpm ./sources.rpm && \
+ rm -vf ./headers.rpm ./sources.rpm && \
  dnf clean all && \
  rm -rf /var/cache/yum && \
  mkdir -p /lib/modules/6.1.34-58.102.amzn2023.x86_64/ && \

diff --git a/images/x86_64/archlinux/5.18/Dockerfile b/images/x86_64/archlinux/5.18/Dockerfile
@@ -5,7 +5,6 @@ WORKDIR /home/ubuntu
 RUN echo 'Server=https://archive.archlinux.org/repos/2022/08/04/$repo/os/$arch' > /etc/pacman.d/mirrorlist && \
 pacman -Syyu --noconfirm && \
  pacman -S --noconfirm \
- bpf \
  clang \
  cmake \
  gcc \

diff --git a/images/x86_64/archlinux/6.0/Dockerfile b/images/x86_64/archlinux/6.0/Dockerfile
@@ -20,10 +20,8 @@ RUN pacman -Syyu --noconfirm && \
  wget && \
  yes | pacman -Scc && \
  curl -Lo headers.tar.zst ${URL}/l/linux-headers/linux-headers-${VERSION}-x86_64.pkg.tar.zst && \
- curl -Lo bpf.tar.zst ${URL}/b/bpf/bpf-6.0-2-x86_64.pkg.tar.zst && \
  pacman -U --noconfirm ./headers.tar.zst && \
- pacman -U --noconfirm ./bpf.tar.zst && \
- rm -v ./headers.tar.zst ./bpf.tar.zst && \
+ rm -v ./headers.tar.zst && \
  ln -sf /usr/share/zoneinfo/US/Eastern /etc/localtime && \
  echo 'LANG=en_US.UTF-8' > /etc/locale.gen && \
  locale-gen && \

diff --git a/images/x86_64/centos/5.14/Dockerfile b/images/x86_64/centos/5.14/Dockerfile
@@ -17,7 +17,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  rsync \
  systemd && \
  curl -Lo headers.rpm ${APPSTR_URL}/kernel-devel-${VERSION}.el9.x86_64.rpm && \
- curl -Lo bpftool.rpm ${BASEOS_URL}/bpftool-7.1.0-325.el9.x86_64.rpm && \
  dnf install -y ./*.rpm && \
  rm -v ./*.rpm && \
  mkdir -p /lib/modules/${VERSION}.el9.x86_64/ && \

diff --git a/images/x86_64/fedora/5.17/Dockerfile b/images/x86_64/fedora/5.17/Dockerfile
@@ -14,7 +14,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  openssh-server \
  rsync \
  systemd && \
- curl -Lo bpftool.rpm ${URL}/b/bpftool-${HVERSION}.fc36.x86_64.rpm && \
  curl -Lo sources.rpm ${URL}/k/kernel-devel-${VERSION}.fc36.x86_64.rpm && \
  curl -Lo headers.rpm ${URL}/k/kernel-headers-${HVERSION}.fc36.x86_64.rpm && \
  dnf install -y ./*.rpm && \

diff --git a/images/x86_64/fedora/5.8/Dockerfile b/images/x86_64/fedora/5.8/Dockerfile
@@ -14,7 +14,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  openssh-server \
  rsync \
  systemd && \
- curl -Lo bpftool.rpm ${URL}/b/bpftool-${HVERSION}.fc33.x86_64.rpm && \
  curl -Lo sources.rpm ${URL}/k/kernel-devel-${VERSION}.fc33.x86_64.rpm && \
  curl -Lo headers.rpm ${URL}/k/kernel-headers-${HVERSION}.fc33.x86_64.rpm && \
  dnf install -y ./*.rpm && \

diff --git a/images/x86_64/fedora/6.2/Dockerfile b/images/x86_64/fedora/6.2/Dockerfile
@@ -14,7 +14,6 @@ RUN dnf groupinstall -y 'Development Tools' && \
  openssh-server \
  rsync \
  systemd && \
- curl -Lo bpftool.rpm ${URL}/b/bpftool-${HVERSION}.fc38.x86_64.rpm && \
  curl -Lo sources.rpm ${URL}/k/kernel-devel-${VERSION}.fc38.x86_64.rpm && \
  curl -Lo headers.rpm ${URL}/k/kernel-headers-${HVERSION}.fc38.x86_64.rpm && \
  dnf install -y ./*.rpm && \

diff --git a/images/x86_64/oraclelinux/5.15/Dockerfile b/images/x86_64/oraclelinux/5.15/Dockerfile
@@ -20,7 +20,6 @@ RUN yum install -y \
  curl -Lo kernel.rpm ${URL}/getPackage/kernel-uek-core-${VERSION}.el9uek.x86_64.rpm && \
  curl -Lo devel.rpm ${URL}/getPackage/kernel-uek-devel-${VERSION}.el9uek.x86_64.rpm && \
  curl -Lo modules.rpm ${URL}/getPackage/kernel-uek-modules-${VERSION}.el9uek.x86_64.rpm && \
- curl -Lo bpftool.rpm ${URL}/getPackage/bpftool-${VERSION}.el9uek.x86_64.rpm && \
  yum install -y ./*.rpm && \
  rm -f ./*.rpm && \
  sed -i -e 's/^AcceptEnv LANG LC_\*$/#AcceptEnv LANG LC_*/' /etc/ssh/sshd_config && \