From b4e8d0b46e2b50d5e808964bb189222ec3b9c9de Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 8 Aug 2013 19:18:51 +0000 Subject: [PATCH 01/11] Add growl files for notifications --- images/gritter-light.png | Bin 0 -> 4978 bytes images/gritter-long.png | Bin 0 -> 6299 bytes images/gritter.png | Bin 0 -> 4880 bytes images/ie-spacer.gif | Bin 0 -> 43 bytes img/.gitkeep | 0 index.html | 13 +- js/controllers.js | 68 +++---- js/services.js | 27 ++- lib/jquery.gritter.css | 101 +++++++++ lib/jquery.gritter.js | 418 ++++++++++++++++++++++++++++++++++++++ lib/jquery.gritter.min.js | 1 + partials/container.html | 21 ++ partials/image.html | 4 + partials/messages.html | 5 +- 14 files changed, 612 insertions(+), 46 deletions(-) create mode 100644 images/gritter-light.png create mode 100755 images/gritter-long.png create mode 100755 images/gritter.png create mode 100644 images/ie-spacer.gif delete mode 100644 img/.gitkeep create mode 100755 lib/jquery.gritter.css create mode 100755 lib/jquery.gritter.js create mode 100644 lib/jquery.gritter.min.js diff --git a/images/gritter-light.png b/images/gritter-light.png new file mode 100644 index 0000000000000000000000000000000000000000..1b5238efc5d524014046ad5cd90ab1024c9ba250 GIT binary patch literal 4978 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 Bt!)4R literal 0 HcmV?d00001 diff --git a/images/gritter-long.png b/images/gritter-long.png new file mode 100755 index 0000000000000000000000000000000000000000..578b89104feb2460a821b8543be29c50008666b6 GIT binary patch literal 6299 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 Zf3P5-;PGuo@D~?gbJgKWjfL<1{{eTAuA%?{ literal 0 HcmV?d00001 diff --git a/images/ie-spacer.gif b/images/ie-spacer.gif new file mode 100644 index 0000000000000000000000000000000000000000..5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9 GIT binary patch literal 43 mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1 literal 0 HcmV?d00001 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..ec17c1263 100644 --- a/index.html +++ b/index.html @@ -7,10 +7,11 @@ - - + + + - + +
+
+

Running Containers

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

DockerUI

From 7ae0b175732b607ffddc68ce58c185053fc334ce Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 2 Sep 2013 15:00:22 -0700 Subject: [PATCH 05/11] Improve messages --- index.html | 1 - js/controllers.js | 35 +++++++++-------------------------- partials/dashboard.html | 17 +++++++++-------- partials/messages.html | 4 ---- 4 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 partials/messages.html diff --git a/index.html b/index.html index aa94a20e7..9a5efea8e 100644 --- a/index.html +++ b/index.html @@ -30,7 +30,6 @@
-
diff --git a/js/controllers.js b/js/controllers.js index b5bdb938c..606ada8d1 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -51,23 +51,6 @@ function DashboardController($scope, Container) { }); } -function MessageController($scope, Messages) { - $scope.template = 'partials/messages.html'; - $scope.messages = []; - $scope.$watch('messages.length', function(o, n) { - $('#message-display').show(); - }); - - $scope.$on(Messages.event, function(e, msg) { - $scope.messages.push(msg); - var s = $scope; - setTimeout(function() { - $('#message-display').hide('slow'); - s.messages = []; - }, 20000); - }); -} - function StatusBarController($scope, Settings) { $scope.template = 'partials/statusbar.html'; @@ -109,7 +92,7 @@ function ContainerController($scope, $routeParams, $location, Container, Message $scope.stop = function() { Container.stop({id: $routeParams.id}, function(d) { - Messages.success("Container stopped", $routeParams.id); + Messages.send("Container stopped", $routeParams.id); }, function(e) { Messages.error("Failure", "Container failed to stop." + e.data); }); @@ -117,7 +100,7 @@ function ContainerController($scope, $routeParams, $location, Container, Message $scope.kill = function() { Container.kill({id: $routeParams.id}, function(d) { - Messages.success("Container killed", $routeParams.id); + Messages.send("Container killed", $routeParams.id); }, function(e) { Messages.error("Failure", "Container failed to die." + e.data); }); @@ -125,7 +108,7 @@ function ContainerController($scope, $routeParams, $location, Container, Message $scope.remove = function() { Container.remove({id: $routeParams.id}, function(d) { - Messages.success("Container removed", $routeParams.id); + Messages.send("Container removed", $routeParams.id); }, function(e){ Messages.error("Failure", "Container failed to remove." + e.data); }); @@ -169,7 +152,7 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner }); }; - var batch = function(items, action) { + var batch = function(items, action, msg) { ViewSpinner.spin(); var counter = 0; var complete = function() { @@ -182,7 +165,7 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner if (c.Checked) { counter = counter + 1; action({id: c.Id}, function(d) { - Messages.error("Container Removed", c.Id); + Messages.send("Container " + msg, c.Id); var index = $scope.containers.indexOf(c); $scope.containers.splice(index, 1); complete(); @@ -211,19 +194,19 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner }; $scope.startAction = function() { - batch($scope.containers, Container.start); + batch($scope.containers, Container.start, "Started"); }; $scope.stopAction = function() { - batch($scope.containers, Container.stop); + batch($scope.containers, Container.stop, "Stopped"); }; $scope.killAction = function() { - batch($scope.containers, Container.kill); + batch($scope.containers, Container.kill, "Killed"); }; $scope.removeAction = function() { - batch($scope.containers, Container.remove); + batch($scope.containers, Container.remove, "Removed"); }; update({all: $scope.displayAll ? 1 : 0}); diff --git a/partials/dashboard.html b/partials/dashboard.html index 2fd8fbbc7..20c97f2a8 100644 --- a/partials/dashboard.html +++ b/partials/dashboard.html @@ -1,8 +1,16 @@ -
+
+
+
+

DockerUI

+

The Linux container engine

+ Learn more. +
+
+

Running Containers

@@ -20,11 +28,4 @@
-
-
-

DockerUI

-

The Linux container engine

- Learn more. -
-
diff --git a/partials/messages.html b/partials/messages.html deleted file mode 100644 index 90527bb6f..000000000 --- a/partials/messages.html +++ /dev/null @@ -1,4 +0,0 @@ - - From b1228a7439fc3de0e3217b40cf0507fc9d409ba2 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 2 Sep 2013 15:10:40 -0700 Subject: [PATCH 06/11] Fix alignment and floats --- css/app.css | 4 ---- partials/dashboard.html | 6 +++--- partials/images.html | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/css/app.css b/css/app.css index 1dc27fbf8..54db7ccba 100644 --- a/css/app.css +++ b/css/app.css @@ -110,10 +110,6 @@ overflow-x: hidden; } -.legend { - width: 7em; -} - .legend .title { margin: 0.5em; border-style: solid; diff --git a/partials/dashboard.html b/partials/dashboard.html index 20c97f2a8..1506365ad 100644 --- a/partials/dashboard.html +++ b/partials/dashboard.html @@ -21,11 +21,11 @@
-
- +
+ Get a better broswer... Your holding everyone back. -
+
diff --git a/partials/images.html b/partials/images.html index df661da55..fa2df94d0 100644 --- a/partials/images.html +++ b/partials/images.html @@ -4,7 +4,6 @@

Images:

    -
  • Build Image
  • Actions
+
+

Containers created:

+ + Get a better broswer... Your holding everyone back. + +
@@ -23,10 +29,6 @@ - - - - @@ -95,7 +97,6 @@
-
diff --git a/partials/images.html b/partials/images.html index fa2df94d0..7751b5d07 100644 --- a/partials/images.html +++ b/partials/images.html @@ -16,7 +16,6 @@ - @@ -24,9 +23,8 @@ - - - + + From 3643525126e4eead7469535934cf657837448444 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 2 Sep 2013 17:08:06 -0700 Subject: [PATCH 08/11] Change image chart sizes --- js/controllers.js | 7 +++++-- partials/dashboard.html | 2 +- partials/image.html | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/controllers.js b/js/controllers.js index 8faddc9ec..724015180 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -304,8 +304,11 @@ function ImageController($scope, $q, $routeParams, $location, Image, Container, Image.get({id: $routeParams.id}, function(d) { $scope.image = d; - if ($routeParams.tag) { - var promise = getContainersFromImage($q, Container, $routeParams.tag); + $scope.tag = d.id; + var t = $routeParams.tag; + if (t && t !== ":") { + $scope.tag = t; + var promise = getContainersFromImage($q, Container, t); promise.then(function(containers) { var map = {}; diff --git a/partials/dashboard.html b/partials/dashboard.html index 1506365ad..b06dfd224 100644 --- a/partials/dashboard.html +++ b/partials/dashboard.html @@ -16,7 +16,7 @@

Running Containers

diff --git a/partials/image.html b/partials/image.html index 28bfb4ae1..4d9e43efe 100644 --- a/partials/image.html +++ b/partials/image.html @@ -6,7 +6,7 @@
-

Image: {{ image.id }}

+

Image: {{ tag }}

From 847c2d570c4f5ba8d83de0353f7a0261ed28e7d7 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 2 Sep 2013 17:18:54 -0700 Subject: [PATCH 09/11] Hide masthead after first load --- js/controllers.js | 13 +++++++++++-- js/services.js | 3 ++- partials/dashboard.html | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/js/controllers.js b/js/controllers.js index 724015180..2ef0bd4d1 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -3,9 +3,18 @@ function MastheadController($scope) { $scope.template = 'partials/masthead.html'; } -function DashboardController($scope, Container) { +function DashboardController($scope, Container, Settings) { $scope.predicate = '-Created'; $scope.containers = []; + var opts = {animation:false}; + if (Settings.firstLoad) { + opts.animation = true; + Settings.firstLoad = false; + $('#masthead').show(); + setTimeout(function() { + $('#masthead').slideUp('slow'); + }, 5000); + } Container.query({all: 1}, function(d) { var running = 0 @@ -44,7 +53,7 @@ function DashboardController($scope, Container) { } // ghost ]; - c.Doughnut(data, {}); + c.Doughnut(data, opts); var lgd = $('#chart-legend').get(0); legend(lgd, data); }); diff --git a/js/services.js b/js/services.js index 18fcae21a..9a6a00268 100644 --- a/js/services.js +++ b/js/services.js @@ -64,7 +64,8 @@ angular.module('dockerui.services', ['ngResource']) version: DOCKER_API_VERSION, rawUrl: DOCKER_ENDPOINT + DOCKER_PORT + '/' + DOCKER_API_VERSION, uiVersion: UI_VERSION, - url: url + url: url, + firstLoad: true, }; }) .factory('ViewSpinner', function() { diff --git a/partials/dashboard.html b/partials/dashboard.html index b06dfd224..18ae5a509 100644 --- a/partials/dashboard.html +++ b/partials/dashboard.html @@ -3,7 +3,7 @@ -
+ - +

Running Containers

@@ -22,10 +22,27 @@
+

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 }}

+
From 007492b77d36ba01e04b27973abea9d316935db8 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 2 Sep 2013 18:55:00 -0700 Subject: [PATCH 11/11] Update dockerfile and server --- Dockerfile | 6 +++--- dockerui.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e452c425..dec150fae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +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"] +ENTRYPOINT ["./dockerui"] diff --git a/dockerui.go b/dockerui.go index f6ca4f6c3..cfc26f153 100644 --- a/dockerui.go +++ b/dockerui.go @@ -13,7 +13,7 @@ var ( 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", "/app", "Path to the assets") + assets = flag.String("a", ".", "Path to the assets") ) type multiHandler struct {
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 }}