Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "update dependency for libxdp/libbpf" #4236

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Revert "update dependency for libxdp/libbpf" #4236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .docker/ubuntu-20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 '*'

14 changes: 7 additions & 7 deletions .docker/ubuntu-22.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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 '*'
Loading