github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Small bug fixes with new docker versions

pull/2/head
Michael Crosby 2013-09-02 13:25:06 -07:00
parent 0baf3aead3
commit cfa8d3a442
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -13,3 +13,4 @@ RUN ln -s /app/dockerui /dockerui
EXPOSE 9000 EXPOSE 9000
ENTRYPOINT ["/dockerui"]

9
dockerui.go
View File

@ -10,10 +10,10 @@ import (
) )
var ( var (
endpoint = flag.String("e", "", "Docker d endpoint.") endpoint = flag.String("e", "", "Dockerd endpoint")
verbose = flag.Bool("v", false, "Verbose logging.") verbose = flag.Bool("v", false, "Verbose logging")
port = flag.String("p", "9000", "Port to serve dockerui.") port = flag.String("p", "9000", "Port to serve dockerui")
assets = flag.String("-a", "/app", "Path to the assets.") assets = flag.String("a", "/app", "Path to the assets")
) )
type multiHandler struct { type multiHandler struct {
@ -34,6 +34,7 @@ func (h *multiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
func isDockerRequest(url string) bool { func isDockerRequest(url string) bool {
log.Printf("Got request: %s", url)
return strings.Contains(url, "dockerapi/") return strings.Contains(url, "dockerapi/")
} }

4
js/app.js
View File

@ -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 // 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_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('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('UI_VERSION', 'v0.2.5')
.constant('DOCKER_API_VERSION', 'v1.2'); .constant('DOCKER_API_VERSION', 'v1.4');

4
js/services.js
View File

@ -83,7 +83,7 @@ angular.module('dockerui.services', ['ngResource'])
title: title, title: title,
text: text, text: text,
time: 2000, time: 2000,
before_open: function{ before_open: function() {
if($('.gritter-item-wrapper').length == 3) { if($('.gritter-item-wrapper').length == 3) {
return false; return false;
} }
@ -96,7 +96,7 @@ angular.module('dockerui.services', ['ngResource'])
title: title, title: title,
text: text, text: text,
time: 6000, time: 6000,
before_open: function{ before_open: function() {
if($('.gritter-item-wrapper').length == 4) { if($('.gritter-item-wrapper').length == 4) {
return false; return false;
} }