diff --git a/Dockerfile b/Dockerfile index 90f9cbc49..dec150fae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,10 +6,11 @@ MAINTAINER Michael Crosby http://crosbymichael.com RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list RUN apt-get update -RUN apt-get upgrade +RUN apt-get upgrade -y ADD . /app/ -RUN ln -s /app/dockerui /dockerui EXPOSE 9000 +WORKDIR /app/ +ENTRYPOINT ["./dockerui"] diff --git a/css/app.css b/css/app.css index f967526d2..54db7ccba 100644 --- a/css/app.css +++ b/css/app.css @@ -109,3 +109,10 @@ overflow-y: scroll; overflow-x: hidden; } + +.legend .title { + margin: 0.5em; + border-style: solid; + border-width: 0 0 0 1em; + padding: 0 0.3em; +} diff --git a/dockerui.go b/dockerui.go index 5c3f78cdc..cfc26f153 100644 --- a/dockerui.go +++ b/dockerui.go @@ -10,10 +10,10 @@ import ( ) var ( - endpoint = flag.String("e", "", "Docker d endpoint.") - verbose = flag.Bool("v", false, "Verbose logging.") - port = flag.String("p", "9000", "Port to serve dockerui.") - assets = flag.String("-a", "/app", "Path to the assets.") + endpoint = flag.String("e", "", "Dockerd endpoint") + verbose = flag.Bool("v", false, "Verbose logging") + port = flag.String("p", "9000", "Port to serve dockerui") + assets = flag.String("a", ".", "Path to the assets") ) type multiHandler struct { @@ -34,6 +34,7 @@ func (h *multiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } func isDockerRequest(url string) bool { + log.Printf("Got request: %s", url) return strings.Contains(url, "dockerapi/") } diff --git a/images/gritter-light.png b/images/gritter-light.png new file mode 100644 index 000000000..1b5238efc Binary files /dev/null and b/images/gritter-light.png differ diff --git a/images/gritter-long.png b/images/gritter-long.png new file mode 100755 index 000000000..578b89104 Binary files /dev/null and b/images/gritter-long.png differ diff --git a/images/gritter.png b/images/gritter.png new file mode 100755 index 000000000..0ca3bc0a0 Binary files /dev/null and b/images/gritter.png differ diff --git a/images/ie-spacer.gif b/images/ie-spacer.gif new file mode 100644 index 000000000..5bfd67a2d Binary files /dev/null and b/images/ie-spacer.gif differ diff --git a/img/.gitkeep b/img/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/index.html b/index.html index 10bb01c9c..9a5efea8e 100644 --- a/index.html +++ b/index.html @@ -7,10 +7,11 @@ - - + + + - + -
+ + +
+
+

Running Containers

+ +
+
+

Status

+ + Get a better broswer... Your holding everyone back. + +
+
+
+ + +
+
+

Containers created

+ + Get a better broswer... Your holding everyone back. + +

{{ totalContainers }}

+
+

Images created

+ + Get a better broswer... Your holding everyone back. + +

{{ totalImages }}

+
diff --git a/partials/image.html b/partials/image.html index 654400c4e..4d9e43efe 100644 --- a/partials/image.html +++ b/partials/image.html @@ -1,13 +1,23 @@
+ +
-

Image: {{ image.id }}

+

Image: {{ tag }}

+
+

Containers created:

+ + Get a better broswer... Your holding everyone back. + +
@@ -19,10 +29,6 @@ - - - - @@ -91,7 +97,6 @@
-
diff --git a/partials/images.html b/partials/images.html index df661da55..7751b5d07 100644 --- a/partials/images.html +++ b/partials/images.html @@ -4,7 +4,6 @@

Images:

- @@ -25,9 +23,8 @@ - - - + + diff --git a/partials/messages.html b/partials/messages.html deleted file mode 100644 index 6857750eb..000000000 --- a/partials/messages.html +++ /dev/null @@ -1,3 +0,0 @@ -
Parent: {{ image.parent }}
Container:{{ image.container }}
Size: {{ image.Size|humansize }}
Action IdTag Repository Created
{{ image.Id|truncate:20}}{{ image.Tag }}{{ image.Repository }}{{ image.Id|truncate:20}}{{ image.Repository }}:{{ image.Tag }} {{ image.Created|getdate }}