DockerUI => UI For Docker

portainer · Apr 30, 2016 · 1b206f2 · 1b206f2
1 parent 02d4161
commit 1b206f2
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 54 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,4 +3,4 @@ FROM scratch
 COPY dist /
 
 EXPOSE 9000
-ENTRYPOINT ["/dockerui"]
+ENTRYPOINT ["/ui-for-docker"]
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-DockerUI: Copyright (c) 2013-2014 Michael Crosby. crosbymichael.com
+UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-## DockerUI
+## UI For Docker
 
 ![Containers](/containers.png)
-DockerUI is a web interface for the Docker Remote API.  The goal is to provide a pure client side implementation so it is effortless to connect and manage docker.  This project is not complete and is still under heavy development.
+UI For Docker is a web interface for the Docker Remote API.  The goal is to provide a pure client side implementation so it is effortless to connect and manage docker.
 
 ![Container](/container.png)
 
@@ -11,35 +11,30 @@ DockerUI is a web interface for the Docker Remote API.  The goal is to provide a
 * Consistency - The web UI should be consistent with the commands found on the docker CLI.
 
 ### Quickstart 
-```
-git clone https://github.com/kevana/ui-for-docker.git
-cd ui-for-docker
-npm install
-npm install -g grunt-cli
-# Make sure your Docker daemon is running
-grunt run     # Takes a while, will build the image locally as dockerui:latest and run it
-# Open your browser to `http://<dockerd host ip>:9000`
-```
+1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock uifd/ui-for-docker`
 
+2. Open your browser to `http://<dockerd host ip>:9000`
 
-Bind mounting the Unix socket into the DockerUI container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your DockerUI instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/crosbymichael/dockerui/wiki/Dockerui-with-Nginx-HTTP-Auth).
+
+
+Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your UI For Docker instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/kevana/ui-for-docker/wiki/Dockerui-with-Nginx-HTTP-Auth).
 
 ### Specify socket to connect to Docker daemon
 
-By default DockerUI connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`.
+By default UI For Docker connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`.
 
 You can use the `-e` flag to change this socket:
 
     # Connect to a tcp socket:
-    $ docker run -d -p 9000:9000 --privileged dockerui/dockerui -e http://127.0.0.1:2375
+    $ docker run -d -p 9000:9000 --privileged uifd/ui-for-docker -e http://127.0.0.1:2375
 
-### Change address/port DockerUI is served on
-DockerUI listens on port 9000 by default. If you run DockerUI inside a container then you can bind the container's internal port to any external address and port:
+### Change address/port UI For Docker is served on
+UI For Docker listens on port 9000 by default. If you run UI For Docker inside a container then you can bind the container's internal port to any external address and port:
 
-    # Expose DockerUI on 10.20.30.1:80
-    $ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock dockerui/dockerui
+    # Expose UI For Docker on 10.20.30.1:80
+    $ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock uifd/ui-for-docker
 
-### Check the [wiki](//github.com/crosbymichael/dockerui/wiki) for more info about using dockerui
+### Check the [wiki](https://github.com/kevana/ui-for-docker/wiki) for more info about using UI For Docker
 
 ### Stack
 * [Angular.js](https://github.com/angular/angular.js)
@@ -58,11 +53,11 @@ DockerUI listens on port 9000 by default. If you run DockerUI inside a container
 
 
 ### License - MIT
-The DockerUI code is licensed under the MIT license.
+The UI For Docker code is licensed under the MIT license.
 
 
-**DockerUI:**
-Copyright (c) 2014 Michael Crosby. crosbymichael.com
+**UI For Docker:**
+Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com)
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation 

diff --git a/app/app.js b/app/app.js
@@ -1,5 +1,5 @@
-angular.module('dockerui', [
-    'dockerui.templates',
+angular.module('uifordocker', [
+    'uifordocker.templates',
     'ngRoute',
     'dockerui.services',
     'dockerui.filters',

diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html
@@ -5,7 +5,7 @@
     <div class="row">
         <div class="col-xs-10" id="masthead" style="display:none">
             <div class="jumbotron">
-                <h1>DockerUI</h1>
+                <h1>UI For Docker</h1>
 
                 <p class="lead">The UI for Docker container engine</p>
                 <a class="btn btn-large btn-success" href="http://docker.io">Learn more.</a>

diff --git a/app/components/footer/statusbar.html b/app/components/footer/statusbar.html
@@ -1,6 +1,6 @@
 <footer class="center well">
     <p>
         <small>Docker API Version: <strong>{{ apiVersion }}</strong> UI Version: <strong>{{ uiVersion }}</strong> <a
-                class="pull-right" href="https://github.com/crosbymichael/dockerui">dockerui</a></small>
+                class="pull-right" href="https://github.com/kevana/ui-for-docker">UI For Docker</a></small>
     </p>
 </footer>
diff --git a/app/components/masthead/masthead.html b/app/components/masthead/masthead.html
@@ -1,5 +1,5 @@
 <div class="masthead">
-    <h3 class="text-muted">DockerUI</h3>
+    <h3 class="text-muted">UI For Docker</h3>
 
     <div class="col-xs-11">
         <ul class="nav well">

diff --git a/bower.json b/bower.json
@@ -1,13 +1,14 @@
 {
-  "name": "dockerui",
+  "name": "uifordocker",
   "version": "0.10.1-beta",
-  "homepage": "https://github.com/crosbymichael/dockerui",
+  "homepage": "https://github.com/kevana/ui-for-docker",
   "authors": [
     "Michael Crosby <crosbymichael@gmail.com>",
-    "Kevan Ahlquist <ahlqu039@umn.edu>"
+    "Kevan Ahlquist <ahlquistkd@gmail.com>"
   ],
   "description": "A web interface for the Docker Remote API.",
   "keywords": [
+    "uifordocker",
     "dockerui",
     "docker",
     "api"

diff --git a/dockerui.go b/dockerui.go
@@ -1,4 +1,4 @@
-package main // import "github.com/crosbymichael/dockerui"
+package main // import "github.com/kevana/ui-for-docker"
 
 import (
 	"flag"
@@ -18,7 +18,7 @@ import (
 
 var (
 	endpoint = flag.String("e", "/var/run/docker.sock", "Dockerd endpoint")
-	addr     = flag.String("p", ":9000", "Address and port to serve dockerui")
+	addr     = flag.String("p", ":9000", "Address and port to serve UI For Docker")
 	assets   = flag.String("a", ".", "Path to the assets")
 	authKey  []byte
 	authKeyFile = "authKey.dat"

diff --git a/examples/swarm/README.md b/examples/swarm/README.md
@@ -1,4 +1,4 @@
-# DockerUI with Swarm
+# UI For Docker with Swarm
 
 This example works with swarm clusters created with docker-machine.
 

diff --git a/examples/swarm/docker-compose.yml b/examples/swarm/docker-compose.yml
@@ -1,5 +1,5 @@
 dockerui:
-  image: dockerui/dockerui
+  image: uifd/ui-for-docker
   command: -e http://127.0.0.1:2375
   net: "host"
 

diff --git a/gruntFile.js b/gruntFile.js
@@ -86,7 +86,7 @@ module.exports = function (grunt) {
         },
         clean: {
             all: ['<%= distdir %>/*'],
-            app: ['<%= distdir %>/*', '!<%= distdir %>/dockerui'],
+            app: ['<%= distdir %>/*', '!<%= distdir %>/ui-for-docker'],
             tmpl: ['<%= distdir %>/templates']
         },
         copy: {
@@ -244,28 +244,28 @@ module.exports = function (grunt) {
         },
         shell: {
             buildImage: {
-                command: 'docker build --rm -t dockerui .'
+                command: 'docker build --rm -t ui-for-docker .'
             },
             buildBinary: {
                 command: [
                     'docker run --rm -v $(pwd):/src centurylink/golang-builder',
-                    'shasum dockerui > dockerui-checksum.txt',
+                    'shasum ui-for-docker > ui-for-docker-checksum.txt',
                     'mkdir -p dist',
-                    'mv dockerui dist/'
-                ].join('&&')
+                    'mv ui-for-docker dist/'
+                ].join(' && ')
             },
             run: {
                 command: [
-                    'docker stop dockerui',
-                    'docker rm dockerui',
-                    'docker run --privileged -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name dockerui dockerui'
+                    'docker stop ui-for-docker',
+                    'docker rm ui-for-docker',
+                    'docker run --privileged -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name ui-for-docker ui-for-docker'
                 ].join(';')
             },
             runSwarm: {
                 command: [
-                    'docker stop dockerui',
-                    'docker rm dockerui',
-                    'docker run --net=host -d --name dockerui dockerui -e http://127.0.0.1:2374'
+                    'docker stop ui-for-docker',
+                    'docker rm ui-for-docker',
+                    'docker run --net=host -d --name ui-for-docker ui-for-docker -e http://127.0.0.1:2374'
                 ].join(';')
             },
             cleanImages: {
@@ -275,7 +275,7 @@ module.exports = function (grunt) {
         'if': {
             binaryNotExist: {
                 options: {
-                    executable: 'dist/dockerui'
+                    executable: 'dist/ui-for-docker'
                 },
                 ifFalse: ['shell:buildBinary']
             }

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en" ng-app="<%= pkg.name %>">
 <head>
     <meta charset="utf-8">
-    <title>DockerUI</title>
+    <title>UI For Docker</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="<%= pkg.author %>">

diff --git a/package.json b/package.json
@@ -1,19 +1,19 @@
 {
   "author": "Michael Crosby & Kevan Ahlquist",
-  "name": "dockerui",
-  "homepage": "https://github.com/crosbymichael/dockerui",
+  "name": "uifordocker",
+  "homepage": "https://github.com/kevana/ui-for-docker",
   "version": "0.10.1-beta",
   "repository": {
     "type": "git",
-    "url": "git@github.com:crosbymichael/dockerui.git"
+    "url": "git@github.com:kevana/ui-for-docker.git"
   },
   "bugs": {
-    "url": "https://github.com/crosbymichael/dockerui/issues"
+    "url": "https://github.com/kevana/ui-for-docker/issues"
   },
   "licenses": [
     {
       "type": "MIT",
-      "url": "https://raw.githubusercontent.com/crosbymichael/dockerui/master/LICENSE"
+      "url": "https://raw.githubusercontent.com/kevana/ui-for-docker/master/LICENSE"
     }
   ],
   "engines": {