Merge pull request google#17 from JasonSwindle/master

Deploy folder re-org google#16
adofsauron · Jun 12, 2014 · 94c6042 · 94c6042
2 parents d776c6f + 34db580
commit 94c6042
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/deploy/docker-only/Dockerfile b/deploy/docker-only/Dockerfile
@@ -0,0 +1,9 @@
+FROM busybox:ubuntu-14.04
+MAINTAINER kyurtsever@google.com dengnan@google.com vmarmol@google.com jason@swindle.me
+
+# Get cAdvisor binaries.
+ADD http://storage.googleapis.com/cadvisor-bin/cadvisor /usr/bin/cadvisor
+RUN chmod +x /usr/bin/cadvisor
+
+EXPOSE 8080
+ENTRYPOINT ["/usr/bin/cadvisor"]
diff --git a/quickstart/Dockerfile → deploy/lmctfy-docker/Dockerfile b/quickstart/Dockerfile → deploy/lmctfy-docker/Dockerfile