Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions images/bpftool/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ FROM ${TESTER_IMAGE} AS tester
FROM ${COMPILERS_IMAGE} AS builder

# renovate: datasource=github-releases depName=libbpf/bpftool
ARG BPFTOOL_VERSION="v7.6.0"
ARG BPFTOOL_VERSION="v7.7.0"
WORKDIR /bpftool
RUN git clone --recurse-submodules --branch "${BPFTOOL_VERSION}" https://github.com/libbpf/bpftool.git /bpftool

RUN \
# From Ubuntu 24.04 builder image, libzstd must be added at the end of LIBS and LIBS_BOOTSTRAP to compile statically
# See https://github.com/libbpf/bpftool/issues/152
sed -i "s/\(LIBS = \$(LIBBPF) -lelf -lz\)/\1 -lzstd/; s/\(LIBS_BOOTSTRAP = \$(LIBBPF_BOOTSTRAP) -lelf -lz\)/\1 -lzstd/" /bpftool/src/Makefile \
apt-get update \
&& apt-get install -y --no-install-recommends libssl-dev \
&& make -C src EXTRA_CFLAGS=--static BPFTOOL_VERSION="${BPFTOOL_VERSION#v}" -j "$(nproc)" \
&& strip /bpftool/src/bpftool \
&& mkdir -p /out/bin \
Expand Down
2 changes: 1 addition & 1 deletion images/bpftool/test/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ commandTests:
args: ["version"]
expectedOutput:
# renovate: datasource=github-releases depName=libbpf/bpftool
- 'bpftool v7.6.0'
- 'bpftool v7.7.0'
- name: "bpftool is statically linked"
command: "ldd"
args: ["/usr/local/bin/bpftool"]
Expand Down