From a09d86585d66783d30fbe5878bd764b3daf85dac Mon Sep 17 00:00:00 2001 From: David Porter Date: Thu, 29 Feb 2024 14:06:57 -0800 Subject: [PATCH] Disable libipmctl in build See https://github.com/google/cadvisor/issues/3482 Signed-off-by: David Porter --- deploy/Dockerfile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 7eb934e6f8..1108f4ab22 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -18,14 +18,16 @@ RUN export DBG="-g -Wall" && \ # ipmctl only supports Intel x86_64 processors. # https://github.com/intel/ipmctl/issues/163 -RUN if [ "$(uname --machine)" = "x86_64" ]; then \ - git clone -b v02.00.00.3885 https://github.com/intel/ipmctl/ && \ - cd ipmctl && \ - mkdir output && \ - cd output && \ - cmake -DRELEASE=ON -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INSTALL_LIBDIR=/usr/local/lib .. && \ - make -j all && \ - make install; fi + +# Disable libipmctl due to https://github.com/google/cadvisor/issues/3482 +#RUN if [ "$(uname --machine)" = "x86_64" ]; then \ + #git clone -b v02.00.00.3885 https://github.com/intel/ipmctl/ && \ + #cd ipmctl && \ + #mkdir output && \ + #cd output && \ + #cmake -DRELEASE=ON -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INSTALL_LIBDIR=/usr/local/lib .. && \ + #make -j all && \ + #make install; fi WORKDIR /go/src/github.com/google/cadvisor @@ -42,11 +44,13 @@ ARG VERSION # libipmctl only works on x86_64 CPUs. RUN export GO_TAGS="libpfm,netgo"; \ if [ "$(uname --machine)" = "x86_64" ]; then \ - export GO_TAGS="$GO_TAGS,libipmctl"; \ + # Disable libipmctl due to https://github.com/google/cadvisor/issues/3482 + #export GO_TAGS="$GO_TAGS,libipmctl"; \ + export GO_TAGS="$GO_TAGS"; \ fi; \ GO_FLAGS="-tags=$GO_TAGS" ./build/build.sh -FROM mirror.gcr.io/library/alpine:3.16 +FROM mirror.gcr.io/library/alpine:3.18 MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com jimmidyson@gmail.com stclair@google.com RUN apk --no-cache add libc6-compat device-mapper findutils ndctl zfs && \