From 3c44a324465872c8326d4c3fe866c6c6b5088691 Mon Sep 17 00:00:00 2001
From: Daiki AMINAKA <1991.daiki@gmail.com>
Date: Thu, 11 Apr 2024 08:09:16 -0700
Subject: [PATCH] Revert "update dependency for libxdp/libbpf (#4234)"

This reverts commit 2602a202079a2d10aeb0be8f280db22b1842b332.
---
 .docker/ubuntu-20.04/Dockerfile | 18 ------------------
 .docker/ubuntu-22.04/Dockerfile | 14 +++++++-------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.docker/ubuntu-20.04/Dockerfile b/.docker/ubuntu-20.04/Dockerfile
index 880b6c0228..0bf10a0375 100644
--- a/.docker/ubuntu-20.04/Dockerfile
+++ b/.docker/ubuntu-20.04/Dockerfile
@@ -39,15 +39,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     cppcheck \
     clang-tidy \
     gdb \
-    libnl-3-dev \
-    libnl-genl-3-dev \
-    libnl-route-3-dev \
-    zlib1g-dev \
-    zlib1g \
-    pkg-config \
-    m4 \
-    libpcap-dev \
-    libelf-dev \
   && rm -rf /var/lib/apt/lists/*
 
 RUN gem install --version 2.8.1 dotenv
@@ -85,14 +76,5 @@ RUN apt-get install --no-install-recommends -y liblttng-ust-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
 
-# install v1.3.0. v1.4.0 cause libc6 conflicts with arm packages
-RUN echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu mantic main" > /etc/apt/sources.list.d/xdp.list && \
-    apt-get update && apt-get install -y -t mantic --no-install-recommends \
-    libc6:amd64 \
-    libc6-dev:amd64 \
-    libxdp-dev:amd64 \
-    libbpf-dev:amd64 \
-    && rm -rf /var/lib/apt/lists/*
-
 RUN git config --global safe.directory '*'
 
diff --git a/.docker/ubuntu-22.04/Dockerfile b/.docker/ubuntu-22.04/Dockerfile
index 6ce2d6eac9..d113f0c06d 100644
--- a/.docker/ubuntu-22.04/Dockerfile
+++ b/.docker/ubuntu-22.04/Dockerfile
@@ -48,6 +48,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h
     m4 \
     libpcap-dev \
     libelf-dev \
+    libc6-dev-i386 \
   && rm -rf /var/lib/apt/lists/*
 
 RUN gem install fpm
@@ -61,6 +62,12 @@ RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsof
         powershell \
   && rm -rf /var/lib/apt/lists/*
 
+RUN wget -q https://github.com/libbpf/bpftool/releases/download/v7.2.0/bpftool-v7.2.0-amd64.tar.gz -O bpftool-amd64.tar.gz && \
+    tar xvzf bpftool-amd64.tar.gz && \
+    chmod +x ./bpftool && \
+    mv ./bpftool /usr/sbin/bpftool && \
+    rm -rf bpftool-amd64.tar.gz
+
 RUN dpkg --add-architecture arm64
 RUN dpkg --add-architecture armhf
 
@@ -84,11 +91,4 @@ RUN apt-get --no-install-recommends install -y liblttng-ust-dev:arm64 \
     libnuma-dev:armhf \
     && rm -rf /var/lib/apt/lists/*
 
-# install v1.3.0. v1.4.0 cause libc6 conflicts with arm packages
-RUN echo "deb [arch=amd64] http://cz.archive.ubuntu.com/ubuntu mantic main" > /etc/apt/sources.list.d/xdp.list && \
-    apt-get update && apt-get install -y -t mantic --no-install-recommends \
-    libxdp-dev:amd64 \
-    libbpf-dev:amd64 \
-    && rm -rf /var/lib/apt/lists/*
-
 RUN git config --global safe.directory '*'