diff --git a/Dockerfile b/Dockerfile index 90f9cbc49..5e452c425 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,3 +13,4 @@ RUN ln -s /app/dockerui /dockerui EXPOSE 9000 +ENTRYPOINT ["/dockerui"] diff --git a/dockerui.go b/dockerui.go index 5c3f78cdc..f6ca4f6c3 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", "/app", "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/js/app.js b/js/app.js index 356c310a6..3af297767 100644 --- a/js/app.js +++ b/js/app.js @@ -14,5 +14,5 @@ angular.module('dockerui', ['dockerui.services', 'dockerui.filters']) // You need to set this to the api endpoint without the port i.e. http://192.168.1.9 .constant('DOCKER_ENDPOINT', '/dockerapi') .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243 - .constant('UI_VERSION', 'v0.2') - .constant('DOCKER_API_VERSION', 'v1.2'); + .constant('UI_VERSION', 'v0.2.5') + .constant('DOCKER_API_VERSION', 'v1.4'); diff --git a/js/services.js b/js/services.js index 276f54670..18fcae21a 100644 --- a/js/services.js +++ b/js/services.js @@ -83,7 +83,7 @@ angular.module('dockerui.services', ['ngResource']) title: title, text: text, time: 2000, - before_open: function{ + before_open: function() { if($('.gritter-item-wrapper').length == 3) { return false; } @@ -96,7 +96,7 @@ angular.module('dockerui.services', ['ngResource']) title: title, text: text, time: 6000, - before_open: function{ + before_open: function() { if($('.gritter-item-wrapper').length == 4) { return false; }