diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index f5b15170..00000000 --- a/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM google/golang-runtime -MAINTAINER dengnan@google.com vmarmol@google.com proppy@google.com - -# TODO(vmarmol): Build from source. -# Get lmctfy and its dependencies. -RUN apt-get update -y --force-yes && apt-get install -y --no-install-recommends --force-yes pkg-config libapparmor1 -ADD http://storage.googleapis.com/cadvisor-bin/lmctfy/libre2.so.0.0.0 /usr/lib/libre2.so.0 -ADD http://storage.googleapis.com/cadvisor-bin/lmctfy/lmctfy /usr/bin/lmctfy -RUN chmod +x /usr/bin/lmctfy - -# Install libprotobuf8. -ADD http://storage.googleapis.com/cadvisor-bin/lmctfy/libprotobuf8_2.5.0-9_amd64.deb /tmp/libprotobuf8_2.5.0-9_amd64.deb -ADD http://storage.googleapis.com/cadvisor-bin/lmctfy/libc6_2.19-1_amd64.deb /tmp/libc6_2.19-1_amd64.deb -RUN dpkg -i /tmp/libc6_2.19-1_amd64.deb /tmp/libprotobuf8_2.5.0-9_amd64.deb - -# The image builds the app and exposes it on 8080. diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 15496b26..ec849cc0 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -7,4 +7,5 @@ MAINTAINER dengnan@google.com vmarmol@google.com ADD cadvisor /usr/bin/cadvisor EXPOSE 8080 -ENTRYPOINT ["/usr/bin/cadvisor"] +ENTRYPOINT ["/usr/bin/cadvisor"] +CMD ["-log_dir", "/"]