From 4efc99fae00f5faec8392c14854f86e7f7c56718 Mon Sep 17 00:00:00 2001 From: kev Date: Tue, 12 Jul 2016 21:09:27 +0800 Subject: [PATCH] fix cadvisor --- cadvisor/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cadvisor/Dockerfile b/cadvisor/Dockerfile index 2c38ba9..dd5009d 100644 --- a/cadvisor/Dockerfile +++ b/cadvisor/Dockerfile @@ -5,19 +5,19 @@ FROM alpine:edge MAINTAINER kev +ENV CADVISOR_VERSION 0.23.4 + RUN set -xe \ - && apk add --update ca-certificates openssl device-mapper zfs \ + && apk add --no-cache ca-certificates openssl device-mapper zfs \ && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk \ && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-bin-2.23-r3.apk \ && apk add --allow-untrusted glibc-2.23-r3.apk glibc-bin-2.23-r3.apk \ - && /usr/glibc/usr/bin/ldconfig /lib /usr/glibc/usr/lib \ - && echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf \ - && rm -rf /var/cache/apk/* + && rm -f *.apk RUN set -xe \ - && wget https://github.com/google/cadvisor/releases/download/v0.23.6/cadvisor -O /usr/bin/cadvisor \ + && wget https://github.com/google/cadvisor/releases/download/v${CADVISOR_VERSION}/cadvisor -O /usr/bin/cadvisor \ && chmod +x /usr/bin/cadvisor EXPOSE 8080 -ENTRYPOINT ["/usr/bin/cadvisor", "-logtostderr"] +ENTRYPOINT ["cadvisor", "-logtostderr"]