github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

update bcc version

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2024-01-25 19:39:04 +02:00
parent 4b3eb1ff38
commit 480ff67ddc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/Dockerfile.bcc
View File

@ -26,20 +26,27 @@ RUN apk update && apk upgrade -a && \
llvm \ llvm \
llvm-dev \ llvm-dev \
llvm-static \ llvm-static \
llvm17-gtest \
luajit-dev \ luajit-dev \
m4 \ m4 \
musl-fts-dev \ musl-fts-dev \
python3 \ python3 \
py3-pip \
xz \
zip \
zlib-dev \ zlib-dev \
&& true && true
# this is just here to make later copies easier; do not forget to change this if the python version updates
ENV PYTHON_VERSION=3.11
RUN ln -s /usr/lib/cmake/llvm10/ /usr/lib/cmake/llvm && \ RUN ln -s /usr/lib/cmake/llvm10/ /usr/lib/cmake/llvm && \
ln -s /usr/include/llvm10/llvm-c/ /usr/include/llvm-c && \ ln -s /usr/include/llvm10/llvm-c/ /usr/include/llvm-c && \
ln -s /usr/include/llvm10/llvm/ /usr/include/llvm ln -s /usr/include/llvm10/llvm/ /usr/include/llvm
WORKDIR /build WORKDIR /build
ENV BCC_COMMIT=14278bf1a52dd76ff66eed02cc9db7c7ec240da6 ENV BCC_COMMIT=v0.29.1
RUN git clone https://github.com/iovisor/bcc.git && \ RUN git clone https://github.com/iovisor/bcc.git && \
cd bcc && \ cd bcc && \
git checkout $BCC_COMMIT && \ git checkout $BCC_COMMIT && \
@ -67,10 +74,9 @@ RUN mkdir -p /out/usr/ && \
RUN mkdir -p /out/usr/lib && \ RUN mkdir -p /out/usr/lib && \
cp -a /usr/lib/libelf* /out/usr/lib/ && \ cp -a /usr/lib/libelf* /out/usr/lib/ && \
cp -a /usr/lib/libstdc* /out/usr/lib/ && \ cp -a /usr/lib/libstdc* /out/usr/lib/ && \
cp -a /usr/lib/libintl* /out/usr/lib/ && \ cp -a /usr/lib/libintl* /out/usr/lib/
cp -a /usr/lib64/* /out/usr/lib/ RUN mkdir -p /out/usr/lib/python${PYTHON_VERSION} && \
RUN mkdir -p /out/usr/lib/python3.8 && \ cp -a /usr/lib/python${PYTHON_VERSION}/site-packages /out/usr/lib/python${PYTHON_VERSION}/
cp -a /usr/lib/python3.8/site-packages /out/usr/lib/python3.8/
RUN mkdir -p /out/usr/share && \ RUN mkdir -p /out/usr/share && \
cp -a /usr/share/bcc /out/usr/share/ cp -a /usr/share/bcc /out/usr/share/
RUN mkdir -p /out/usr/bin && \ RUN mkdir -p /out/usr/bin && \
@ -90,6 +96,6 @@ FROM scratch
ENTRYPOINT [] ENTRYPOINT []
CMD [] CMD []
WORKDIR / WORKDIR /
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib64 ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
COPY --from=mirror /out / COPY --from=mirror /out /
COPY --from=build /out / COPY --from=build /out /

1
kernel/Dockerfile.perf
View File

@ -24,6 +24,7 @@ RUN apk add \
mpc1-dev \ mpc1-dev \
mpfr-dev \ mpfr-dev \
python3 \ python3 \
python3-dev \
sed \ sed \
tar \ tar \
xz \ xz \