Skip to content

Commit a09d865

Browse files
committed
Disable libipmctl in build
See google#3482 Signed-off-by: David Porter <[email protected]>
1 parent 3b9c146 commit a09d865

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

deploy/Dockerfile

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ RUN export DBG="-g -Wall" && \
1818

1919
# ipmctl only supports Intel x86_64 processors.
2020
# https://github.com/intel/ipmctl/issues/163
21-
RUN if [ "$(uname --machine)" = "x86_64" ]; then \
22-
git clone -b v02.00.00.3885 https://github.com/intel/ipmctl/ && \
23-
cd ipmctl && \
24-
mkdir output && \
25-
cd output && \
26-
cmake -DRELEASE=ON -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INSTALL_LIBDIR=/usr/local/lib .. && \
27-
make -j all && \
28-
make install; fi
21+
22+
# Disable libipmctl due to https://github.com/google/cadvisor/issues/3482
23+
#RUN if [ "$(uname --machine)" = "x86_64" ]; then \
24+
#git clone -b v02.00.00.3885 https://github.com/intel/ipmctl/ && \
25+
#cd ipmctl && \
26+
#mkdir output && \
27+
#cd output && \
28+
#cmake -DRELEASE=ON -DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INSTALL_LIBDIR=/usr/local/lib .. && \
29+
#make -j all && \
30+
#make install; fi
2931

3032
WORKDIR /go/src/github.com/google/cadvisor
3133

@@ -42,11 +44,13 @@ ARG VERSION
4244
# libipmctl only works on x86_64 CPUs.
4345
RUN export GO_TAGS="libpfm,netgo"; \
4446
if [ "$(uname --machine)" = "x86_64" ]; then \
45-
export GO_TAGS="$GO_TAGS,libipmctl"; \
47+
# Disable libipmctl due to https://github.com/google/cadvisor/issues/3482
48+
#export GO_TAGS="$GO_TAGS,libipmctl"; \
49+
export GO_TAGS="$GO_TAGS"; \
4650
fi; \
4751
GO_FLAGS="-tags=$GO_TAGS" ./build/build.sh
4852

49-
FROM mirror.gcr.io/library/alpine:3.16
53+
FROM mirror.gcr.io/library/alpine:3.18
5054
5155

5256
RUN apk --no-cache add libc6-compat device-mapper findutils ndctl zfs && \

0 commit comments

Comments
 (0)