prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to alpine for release image & add devicemapper tools to docker images

Browse Source
This commit is contained in:
Jimmi Dyson 2015-10-20 15:37:33 +01:00
parent b8b6e1bac1
commit 8e63ba34fe
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deploy/Dockerfile
View File

@ -1,8 +1,16 @@
FROM progrium/busybox FROM alpine:3.2
MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com 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. # Grab cadvisor from the staging directory.
ADD cadvisor /usr/bin/cadvisor ADD cadvisor /usr/bin/cadvisor
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["/usr/bin/cadvisor"] ENTRYPOINT ["/usr/bin/cadvisor", "-logtostderr"]

3
deploy/canary/Dockerfile
View File

@ -1,8 +1,7 @@
FROM golang:latest FROM golang:latest
MAINTAINER vmarmol@google.com MAINTAINER vmarmol@google.com
RUN apt-get install -y git thin-provisioning-tools
RUN apt-get install -y git
RUN git clone https://github.com/google/cadvisor.git /go/src/github.com/google/cadvisor RUN git clone https://github.com/google/cadvisor.git /go/src/github.com/google/cadvisor
RUN go get github.com/tools/godep RUN go get github.com/tools/godep
RUN cd /go/src/github.com/google/cadvisor && godep go build . RUN cd /go/src/github.com/google/cadvisor && godep go build .