From 8e63ba34fe397f1bcf61e2c7be9c7518c84d42eb Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Tue, 20 Oct 2015 15:37:33 +0100 Subject: [PATCH] Switch to alpine for release image & add devicemapper tools to docker images --- deploy/Dockerfile | 14 +++++++++++--- deploy/canary/Dockerfile | 3 +-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 1c1b2d28..7beed2ac 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,8 +1,16 @@ -FROM progrium/busybox -MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com +FROM alpine:3.2 +MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com jimmidyson@gmail.com + +RUN apk add --update ca-certificates 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 && \ + /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/* # Grab cadvisor from the staging directory. ADD cadvisor /usr/bin/cadvisor EXPOSE 8080 -ENTRYPOINT ["/usr/bin/cadvisor"] +ENTRYPOINT ["/usr/bin/cadvisor", "-logtostderr"] diff --git a/deploy/canary/Dockerfile b/deploy/canary/Dockerfile index 6d4666d9..14d7d769 100644 --- a/deploy/canary/Dockerfile +++ b/deploy/canary/Dockerfile @@ -1,8 +1,7 @@ FROM golang:latest MAINTAINER vmarmol@google.com - -RUN apt-get install -y git +RUN apt-get install -y git thin-provisioning-tools RUN git clone https://github.com/google/cadvisor.git /go/src/github.com/google/cadvisor RUN go get github.com/tools/godep RUN cd /go/src/github.com/google/cadvisor && godep go build .