Merge branch 'release/1.0.3'

9 years ago · b940c7bfbd
parent 2ec247827d 1460d69cd1
commit b940c7bfbd
10 changed files with 211 additions and 15 deletions
--- a/app/app.js
+++ b/app/app.js
@ -10,6 +10,7 @@ angular.module('uifordocker', [
  'dashboard',
  'container',
  'containers',
+  'docker',
  'images',
  'image',
  'pullImage',
@ -56,6 +57,11 @@ angular.module('uifordocker', [
      templateUrl: 'app/components/containerLogs/containerlogs.html',
      controller: 'ContainerLogsController'
    })
+    .state('docker', {
+      url: '/docker/',
+      templateUrl: 'app/components/docker/docker.html',
+      controller: 'DockerController'
+    })
    .state('images', {
      url: '/images/',
      templateUrl: 'app/components/images/images.html',
@ -113,4 +119,5 @@ angular.module('uifordocker', [
  // 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', 'v1.0.2');
+  .constant('CONFIG_ENDPOINT', '/config')
+  .constant('UI_VERSION', 'v1.0.3');
--- a/app/components/dashboard/master-ctrl.js
+++ b/app/components/dashboard/master-ctrl.js
@ -1,5 +1,5 @@
 angular.module('dashboard')
-.controller('MasterCtrl', ['$scope', '$cookieStore', 'Settings', function ($scope, $cookieStore, Settings) {
+.controller('MasterCtrl', ['$scope', '$cookieStore', 'Settings', 'Config', function ($scope, $cookieStore, Settings, Config) {
  /**
  * Sidebar Toggle & Cookie Control
  */
@ -9,6 +9,8 @@ angular.module('dashboard')
    return window.innerWidth;
  };

+  $scope.config = Config.get();
+
  $scope.$watch($scope.getWidth, function(newValue, oldValue) {
    if (newValue >= mobileView) {
      if (angular.isDefined($cookieStore.get('toggle'))) {
--- a/app/components/docker/docker.html
+++ b/app/components/docker/docker.html
@ -0,0 +1,145 @@
+<rd-header>
+  <rd-header-title title="Engine overview">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="docker" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+  <rd-header-content>Docker</rd-header-content>
+</rd-header>
+<div class="row">
+  <div class="col-lg-3 col-md-6 col-xs-12">
+    <rd-widget>
+      <rd-widget-body>
+        <div class="widget-icon pull-left">
+          <i class="fa fa-code"></i>
+        </div>
+        <div class="title">{{ docker.Version }}</div>
+        <div class="comment">Docker version</div>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+  <div class="col-lg-3 col-md-6 col-xs-12">
+    <rd-widget>
+      <rd-widget-body>
+        <div class="widget-icon pull-left">
+          <i class="fa fa-code"></i>
+        </div>
+        <div class="title">{{ docker.ApiVersion }}</div>
+        <div class="comment">API version</div>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+  <div class="col-lg-3 col-md-6 col-xs-12">
+    <rd-widget>
+      <rd-widget-body>
+        <div class="widget-icon pull-left">
+          <i class="fa fa-code"></i>
+        </div>
+        <div class="title">{{ docker.GoVersion }}</div>
+        <div class="comment">Go version</div>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-lg-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-object-group" title="Cluster status"></rd-widget-header>
+      <rd-widget-body classes="no-padding">
+        <table class="table">
+          <tbody>
+            <tr>
+              <td>Containers</td>
+              <td>{{ info.Containers }}</td>
+            </tr>
+            <tr>
+              <td>Images</td>
+              <td>{{ info.Images }}</td>
+            </tr>
+            <tr>
+              <td>Debug</td>
+              <td>{{ info.Debug }}</td>
+            </tr>
+            <tr>
+              <td>CPUs</td>
+              <td>{{ info.NCPU }}</td>
+            </tr>
+            <tr>
+              <td>Total Memory</td>
+              <td>{{ info.MemTotal|humansize }}</td>
+            </tr>
+            <tr>
+              <td>Operating System</td>
+              <td>{{ info.OperatingSystem }}</td>
+            </tr>
+            <tr>
+              <td>Kernel Version</td>
+              <td>{{ info.KernelVersion }}</td>
+            </tr>
+            <tr>
+              <td>ID</td>
+              <td>{{ info.ID }}</td>
+            </tr>
+            <tr>
+              <td>Labels</td>
+              <td>{{ info.Labels }}</td>
+            </tr>
+            <tr>
+              <td>File Descriptors</td>
+              <td>{{ info.NFd }}</td>
+            </tr>
+            <tr>
+              <td>Goroutines</td>
+              <td>{{ info.NGoroutines }}</td>
+            </tr>
+            <tr>
+              <td>Storage Driver</td>
+              <td>{{ info.Driver }}</td>
+            </tr>
+            <tr>
+              <td>Storage Driver Status</td>
+              <td>
+                <p ng-repeat="val in info.DriverStatus">
+                  {{ val[0] }}: {{ val[1] }}
+                </p>
+              </td>
+            </tr>
+            <tr>
+              <td>Execution Driver</td>
+              <td>{{ info.ExecutionDriver }}</td>
+            </tr>
+            <tr>
+              <td>IPv4 Forwarding</td>
+              <td>{{ info.IPv4Forwarding }}</td>
+            </tr>
+            <tr>
+              <td>Index Server Address</td>
+              <td>{{ info.IndexServerAddress }}</td>
+            </tr>
+            <tr>
+              <td>Init Path</td>
+              <td>{{ info.InitPath }}</td>
+            </tr>
+            <tr>
+              <td>Docker Root Directory</td>
+              <td>{{ info.DockerRootDir }}</td>
+            </tr>
+            <tr>
+              <td>Init SHA1</td>
+              <td>{{ info.InitSha1 }}</td>
+            </tr>
+            <tr>
+              <td>Memory Limit</td>
+              <td>{{ info.MemoryLimit }}</td>
+            </tr>
+            <tr>
+              <td>Swap Limit</td>
+              <td>{{ info.SwapLimit }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
--- a/app/components/docker/dockerController.js
+++ b/app/components/docker/dockerController.js
@ -0,0 +1,19 @@
+angular.module('docker', [])
+.controller('DockerController', ['$scope', 'Info', 'Version', 'Settings',
+function ($scope, Info, Version, Settings) {
+
+  $scope.info = {};
+  $scope.docker = {};
+  
+  $scope.order = function(sortType) {
+    $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
+    $scope.sortType = sortType;
+  };
+
+  Version.get({}, function (d) {
+    $scope.docker = d;
+  });
+  Info.get({}, function (d) {
+    $scope.info = d;
+  });
+}]);
--- a/app/shared/services.js
+++ b/app/shared/services.js
@ -142,6 +142,9 @@ angular.module('dockerui.services', ['ngResource', 'ngSanitize'])
            remove: {method: 'DELETE'}
        });
    }])
+    .factory('Config', ['$resource', 'CONFIG_ENDPOINT', function($resource, CONFIG_ENDPOINT) {
+      return $resource(CONFIG_ENDPOINT);
+    }])
    .factory('Settings', ['DOCKER_ENDPOINT', 'DOCKER_PORT', 'UI_VERSION', function SettingsFactory(DOCKER_ENDPOINT, DOCKER_PORT, UI_VERSION) {
        'use strict';
        var url = DOCKER_ENDPOINT;
@ -150,11 +153,11 @@ angular.module('dockerui.services', ['ngResource', 'ngSanitize'])
        }
        var firstLoad = (localStorage.getItem('firstLoad') || 'true') === 'true';
        return {
-            displayAll: false,
-            endpoint: DOCKER_ENDPOINT,
-            uiVersion: UI_VERSION,
-            url: url,
-            firstLoad: firstLoad
+          displayAll: false,
+          endpoint: DOCKER_ENDPOINT,
+          uiVersion: UI_VERSION,
+          url: url,
+          firstLoad: firstLoad
        };
    }])
    .factory('ViewSpinner', function ViewSpinnerFactory() {
--- a/bower.json
+++ b/bower.json
@ -1,6 +1,6 @@
 {
  "name": "uifordocker",
-  "version": "1.0.2",
+  "version": "1.0.3",
  "homepage": "https://github.com/kevana/ui-for-docker",
  "authors": [
    "Michael Crosby <crosbymichael@gmail.com>",
--- a/dockerui.go
+++ b/dockerui.go
@ -1,4 +1,4 @@
-package main // import "github.com/cloudinovasi/cloudinovasi-ui"
+package main // import "github.com/cloudinovasi/ui-for-docker"

 import (
 	"flag"
@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"encoding/json"
 	"os"
 	"strings"
 	"github.com/gorilla/csrf"
@ -20,6 +21,7 @@ var (
 	endpoint = flag.String("e", "/var/run/docker.sock", "Dockerd endpoint")
 	addr     = flag.String("p", ":9000", "Address and port to serve UI For Docker")
 	assets   = flag.String("a", ".", "Path to the assets")
+	swarm		 = flag.Bool("s", false, "Swarm mode")
 	authKey  []byte
 	authKeyFile = "authKey.dat"
 )
@ -28,6 +30,10 @@ type UnixHandler struct {
 	path string
 }

+type Config struct {
+	Swarm bool `json:"swarm"`
+}
+
 func (h *UnixHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	conn, err := net.Dial("unix", h.path)
 	if err != nil {
@ -60,6 +66,10 @@ func copyHeader(dst, src http.Header) {
 	}
 }

+func configurationHandler(w http.ResponseWriter, r *http.Request, c Config) {
+    json.NewEncoder(w).Encode(c)
+}
+
 func createTcpHandler(e string) http.Handler {
 	u, err := url.Parse(e)
 	if err != nil {
@ -72,7 +82,7 @@ func createUnixHandler(e string) http.Handler {
 	return &UnixHandler{e}
 }

-func createHandler(dir string, e string) http.Handler {
+func createHandler(dir string, e string, s bool) http.Handler {
 	var (
 		mux         = http.NewServeMux()
 		fileHandler = http.FileServer(http.Dir(dir))
@ -110,8 +120,15 @@ func createHandler(dir string, e string) http.Handler {
 		csrf.Secure(false),
 	)

+	configuration := Config{
+		Swarm: s,
+	}
+
 	mux.Handle("/dockerapi/", http.StripPrefix("/dockerapi", h))
 	mux.Handle("/", fileHandler)
+	mux.HandleFunc("/config", func(w http.ResponseWriter, r *http.Request) {
+  	configurationHandler(w, r, configuration)
+  })
 	return CSRF(csrfWrapper(mux))
 }

@ -125,7 +142,7 @@ func csrfWrapper(h http.Handler) http.Handler {
 func main() {
 	flag.Parse()

-	handler := createHandler(*assets, *endpoint)
+	handler := createHandler(*assets, *endpoint, *swarm)
 	if err := http.ListenAndServe(*addr, handler); err != nil {
 		log.Fatal(err)
 	}
--- a/gruntFile.js
+++ b/gruntFile.js
@ -37,7 +37,7 @@ module.exports = function (grunt) {
    ]);
    grunt.registerTask('test-watch', ['karma:watch']);
    grunt.registerTask('run', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:run']);
-    grunt.registerTask('runSwarm', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:runSwarm', 'watch:buildSwarm']);
+    grunt.registerTask('run-swarm', ['if:binaryNotExist', 'build', 'shell:buildImage', 'shell:runSwarm', 'watch:buildSwarm']);
    grunt.registerTask('run-dev', ['if:binaryNotExist', 'shell:buildImage', 'shell:run', 'watch:build']);
    grunt.registerTask('clear', ['clean:app']);

@ -267,7 +267,7 @@ module.exports = function (grunt) {
                command: [
                    'docker stop ui-for-docker',
                    'docker rm ui-for-docker',
-                    'docker run --net=host -d --name ui-for-docker ui-for-docker -e http://10.0.7.11:4000'
+                    'docker run --privileged -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name ui-for-docker ui-for-docker -s'
                ].join(';')
            },
            cleanImages: {
--- a/index.html
+++ b/index.html
@ -52,9 +52,12 @@
        <li class="sidebar-list">
          <a ui-sref="volumes">Volumes <span class="menu-icon fa fa-cubes"></span></a>
        </li>
-        <li class="sidebar-list">
+        <li class="sidebar-list" ng-if="config.swarm">
          <a ui-sref="swarm">Swarm <span class="menu-icon fa fa-object-group"></span></a>
        </li>
+        <li class="sidebar-list" ng-if="!config.swarm">
+          <a ui-sref="docker">Docker <span class="menu-icon fa fa-cogs"></span></a>
+        </li>
      </ul>
      <div class="sidebar-footer">
        <div class="col-xs-12">
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "author": "Michael Crosby & Kevan Ahlquist",
  "name": "uifordocker",
  "homepage": "https://github.com/kevana/ui-for-docker",
-  "version": "1.0.2",
+  "version": "1.0.3",
  "repository": {
    "type": "git",
    "url": "git@github.com:kevana/ui-for-docker.git"