-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3483 from bobbypage/fix-make-release
Bump to alpine 3.18 and disable libipmctl
- Loading branch information
Showing
2 changed files
with
18 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM registry.hub.docker.com/library/golang:1.20-alpine3.16 AS build | ||
FROM registry.hub.docker.com/library/golang:1.22-alpine3.18 AS build | ||
|
||
# Install build depdencies for all supported arches | ||
RUN apk --no-cache add bash build-base cmake device-mapper findutils git \ | ||
|
@@ -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 [email protected] [email protected] [email protected] [email protected] [email protected] | ||
|
||
RUN apk --no-cache add libc6-compat device-mapper findutils ndctl zfs && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters