From da0314427c8cba2284336e5fc097dba87d6db1d4 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 11 Jul 2016 10:11:29 +0800 Subject: [PATCH] fix cadvisor --- cadvisor/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cadvisor/Dockerfile b/cadvisor/Dockerfile index 3b1614c..2c38ba9 100644 --- a/cadvisor/Dockerfile +++ b/cadvisor/Dockerfile @@ -2,15 +2,14 @@ # Dockerfile for cadvisor # -FROM alpine +FROM alpine:edge MAINTAINER kev RUN set -xe \ - && apk add --update ca-certificates openssl device-mapper \ - && wget https://circle-artifacts.com/gh/andyshinn/alpine-pkg-glibc/8/artifacts/0/home/ubuntu/alpine-pkg-glibc/packages/x86_64/glibc-2.21-r2.apk \ - && wget https://circle-artifacts.com/gh/andyshinn/alpine-pkg-glibc/8/artifacts/0/home/ubuntu/alpine-pkg-glibc/packages/x86_64/glibc-bin-2.21-r2.apk \ - && apk add --allow-untrusted glibc-2.21-r2.apk glibc-bin-2.21-r2.apk \ - && apk add zfs-utils --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ + && apk add --update 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/*