mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
cadvisor update to v0.51.0 and support for riscv64
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
parent
4cbac4f970
commit
fa8afa0e29
@ -7,7 +7,7 @@ RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
|
||||
ENV GOPATH=/go PATH=$PATH:/go/bin
|
||||
ENV GITBASE=github.com/google
|
||||
ENV GITREPO=github.com/google/cadvisor
|
||||
ENV COMMIT=v0.36.0
|
||||
ENV COMMIT=v0.51.0
|
||||
|
||||
ADD /static.patch /tmp/
|
||||
|
||||
@ -18,7 +18,7 @@ RUN mkdir -p /go/src/${GITBASE} \
|
||||
&& git checkout ${COMMIT} \
|
||||
&& patch -p1 build/build.sh </tmp/static.patch \
|
||||
&& make build \
|
||||
&& mv cadvisor /usr/bin/
|
||||
&& mv _output/cadvisor /usr/bin/
|
||||
|
||||
|
||||
FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS mirror
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- build/build.sh.orig 2017-11-16 16:29:18.281342577 +0000
|
||||
+++ build/build.sh 2017-11-16 16:29:55.534787421 +0000
|
||||
@@ -44,6 +44,7 @@
|
||||
@@ -47,6 +47,7 @@
|
||||
-X ${repo_path}/version.BuildDate${ldseparator}${BUILD_DATE}
|
||||
-X ${repo_path}/version.GoVersion${ldseparator}${go_version}"
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM debian:bullseye-slim as base
|
||||
FROM debian:trixie-slim as base
|
||||
|
||||
ARG TARGETARCH
|
||||
|
||||
@ -12,6 +12,9 @@ ENV SYSLINUX="syslinux"
|
||||
FROM base as syslinux-arm64
|
||||
ENV SYSLINUX_arm64="syslinux-common"
|
||||
|
||||
FROM base as syslinux-riscv64
|
||||
ENV SYSLINUX_riscv64="syslinux-common"
|
||||
|
||||
FROM syslinux-${TARGETARCH} as syslinux
|
||||
RUN apt-get update && \
|
||||
apt-get -yq upgrade && \
|
||||
|
@ -3,3 +3,4 @@ network: true
|
||||
arches:
|
||||
- arm64
|
||||
- amd64
|
||||
- riscv64
|
||||
|
@ -2,3 +2,4 @@ image: mkimage-dynamic-vhd
|
||||
arches:
|
||||
- amd64
|
||||
- arm64
|
||||
- riscv64
|
||||
|
@ -3,3 +3,4 @@ network: true
|
||||
arches:
|
||||
- amd64
|
||||
- arm64
|
||||
- riscv64
|
||||
|
@ -3,3 +3,4 @@ network: true
|
||||
arches:
|
||||
- amd64
|
||||
- arm64
|
||||
- riscv64
|
||||
|
@ -3,3 +3,4 @@ network: true
|
||||
arches:
|
||||
- amd64
|
||||
- arm64
|
||||
- riscv64
|
||||
|
@ -2,3 +2,4 @@ image: mkimage-vhd
|
||||
arches:
|
||||
- amd64
|
||||
- arm64
|
||||
- riscv64
|
||||
|
@ -2,3 +2,4 @@ image: mkimage-vmdk
|
||||
arches:
|
||||
- amd64
|
||||
- arm64
|
||||
- riscv64
|
||||
|
Loading…
Reference in New Issue
Block a user