Merge branch 'develop' into webpack

api/swagger.yaml

@@ -4273,7 +4273,7 @@ definitions:
       Prune:
         type: "boolean"
         example: false
-        description: "Prune services that are no longer referenced"
+        description: "Prune services that are no longer referenced (only available for Swarm stacks)"
   StackFileInspectResponse:
     type: "object"
     properties:

app/docker/__module.js

@@ -141,6 +141,16 @@ angular.module('portainer.docker', ['portainer.app'])
     }
   };
 
+  var hostBrowser = {
+    name: 'docker.host.browser',
+    url: '/browser',
+    views: {
+      'content@': {
+        component: 'hostBrowserView'
+      }
+    }
+  };
+
   var events = {
     name: 'docker.events',
     url: '/events',
@@ -441,6 +451,7 @@ angular.module('portainer.docker', ['portainer.app'])
   $stateRegistryProvider.register(docker);
   $stateRegistryProvider.register(dashboard);
   $stateRegistryProvider.register(host);
+  $stateRegistryProvider.register(hostBrowser);
   $stateRegistryProvider.register(events);
   $stateRegistryProvider.register(images);
   $stateRegistryProvider.register(image);

app/docker/components/dockerSidebarContent/docker-sidebar-content.js

@@ -1,10 +1,9 @@
 angular.module('portainer.docker').component('dockerSidebarContent', {
   templateUrl: './dockerSidebarContent.html',
   bindings: {
-    'endpointApiVersion': '<',
+    endpointApiVersion: '<',
-    'swarmManagement': '<',
+    swarmManagement: '<',
-    'standaloneManagement': '<',
+    standaloneManagement: '<',
-    'adminAccess': '<',
+    adminAccess: '<'
-    'isAgent': '<'
   }
 });

app/docker/components/host-overview/host-overview.html

@@ -11,7 +11,10 @@
   <rd-header-content>Docker</rd-header-content>
 </rd-header>
 
-<host-details-panel host="$ctrl.hostDetails" is-agent="$ctrl.isAgent"></host-details-panel>
+<host-details-panel 
+  host="$ctrl.hostDetails" 
+  is-agent="$ctrl.isAgent"
+  browse-url="{{$ctrl.browseUrl}}"></host-details-panel>
 
 <engine-details-panel engine="$ctrl.engineDetails"></engine-details-panel>
 

app/docker/components/host-overview/host-overview.js

@@ -6,7 +6,8 @@ angular.module('portainer.docker').component('hostOverview', {
     devices: '<',
     disks: '<',
     isAgent: '<',
-    refreshUrl: '@'
+    refreshUrl: '@',
+    browseUrl: '@'
   },
   transclude: true
 });

app/docker/components/host-view-panels/host-details-panel/host-details-panel.html

@@ -26,6 +26,17 @@
               <td>Total memory</td>
               <td>{{ $ctrl.host.totalMemory | humansize }}</td>
             </tr>
+            <tr ng-if="$ctrl.isAgent">
+              <td colspan="2">
+                <button 
+                  class="btn btn-primary btn-sm"
+                  title="Browse" 
+                  ui-sref="{{$ctrl.browseUrl}}">
+                  Browse
+                </button>
+              </td>
+            </tr>
+
           </tbody>
         </table>
       </rd-widget-body>

app/docker/components/host-view-panels/host-details-panel/host-details-panel.js

@@ -3,6 +3,7 @@ angular.module('portainer.docker').component('hostDetailsPanel', {
     'app/docker/components/host-view-panels/host-details-panel/host-details-panel.html',
   bindings: {
     host: '<',
-    isAgent: '<'
+    isAgent: '<',
+    browseUrl: '@'
   }
 });

app/docker/views/containers/create/createContainerController.js

@@ -551,14 +551,8 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
 
     SystemService.info()
     .then(function success(data) {
-      var runtimes = data.Runtimes;
+      $scope.availableRuntimes = Object.keys(data.Runtimes);
-      $scope.availableRuntimes = runtimes;
+      $scope.config.HostConfig.Runtime = '';
-      if ('runc' in runtimes) {
-        $scope.config.HostConfig.Runtime = 'runc';
-      }
-      else if (Object.keys(runtimes).length !== 0) {
-        $scope.config.HostConfig.Runtime = Object.keys(runtimes)[0];
-      }
       $scope.state.sliderMaxCpu = 32;
       if (data.NCPU) {
         $scope.state.sliderMaxCpu = data.NCPU;

app/docker/views/containers/create/createcontainer.html

@@ -503,11 +503,11 @@
               <!-- !privileged-mode -->
               <!-- runtimes -->
               <div class="form-group">
-                <label for="container_runtime" class="col-sm-2 col-lg-1 control-label text-left">Runtime</label>
+                <label for="container_runtime" class="col-sm-1 control-label text-left">Runtime</label>
-                <div class="col-sm-1">
+                <div class="col-sm-11">
-                  <select class="form-control" ng-model="config.HostConfig.Runtime" id="container_runtime">
+                  <select class="form-control" ng-model="config.HostConfig.Runtime"
-                    <option selected disabled hidden value="">Select a runtime</option>
+                    id="container_runtime" ng-options="runtime for runtime in availableRuntimes">
-                    <option ng-repeat="(runtime, _) in availableRuntimes" ng-value="runtime">{{ runtime }}</option>
+                    <option selected value="">Default</option>
                   </select>
                 </div>
               </div>

app/docker/views/host/host-browser-view/host-browser-view-controller.js

@@ -0,0 +1,21 @@
+angular
+  .module('portainer.docker')
+  .controller('HostBrowserViewController', [
+    'SystemService', 'HttpRequestHelper',
+    function HostBrowserViewController(SystemService, HttpRequestHelper) {
+      var ctrl = this;
+
+      ctrl.$onInit = $onInit;
+
+      function $onInit() {
+        loadInfo();
+      }
+
+      function loadInfo() {
+        SystemService.info().then(function onInfoLoaded(host) {
+          HttpRequestHelper.setPortainerAgentTargetHeader(host.Name);
+          ctrl.host = host;
+        });
+      }
+    }
+  ]);

app/docker/views/host/host-browser-view/host-browser-view.html

@@ -0,0 +1,14 @@
+<rd-header>
+  <rd-header-title title-text="Host Browser"></rd-header-title>
+  <rd-header-content>
+      Host &gt; <a ui-sref="docker.host">{{ $ctrl.host.Name }}</a> &gt; browse
+  </rd-header-content>
+</rd-header>
+
+<div class="row">
+  <div class="col-sm-12">
+    <host-browser
+     ng-if="$ctrl.host"
+    ></host-browser>
+  </div>
+</div>

app/docker/views/host/host-browser-view/host-browser-view.js

@@ -0,0 +1,4 @@
+angular.module('portainer.docker').component('hostBrowserView', {
+  templateUrl: './host-browser-view.html',
+  controller: 'HostBrowserViewController'
+});

app/docker/views/host/host-view.html

@@ -1,8 +1,10 @@
 <host-overview
   engine-details="$ctrl.engineDetails"
   host-details="$ctrl.hostDetails"
-  refresh-url="docker.host"
   is-agent="$ctrl.state.isAgent"
   disks="$ctrl.disks"
   devices="$ctrl.devices"
+
+  refresh-url="docker.host"
+  browse-url="docker.host.browser"
 ></host-overview>

app/docker/views/nodes/node-browser/node-browser.html

@@ -1,7 +1,7 @@
 <rd-header>
   <rd-header-title title-text="Node Browser"></rd-header-title>
   <rd-header-content>
-      <a ui-sref="docker.nodes">Nodes</a> &gt; <a ui-sref="docker.nodes.node({ id: $ctrl.nodeId })">{{ $ctrl.node.Hostname }}</a> &gt; browse
+      <a ui-sref="docker.swarm">Swarm</a> &gt; <a ui-sref="docker.nodes.node({ id: $ctrl.nodeId })">{{ $ctrl.node.Hostname }}</a> &gt; browse
   </rd-header-content>
 </rd-header>
 

app/docker/views/nodes/node-details/node-details-view.html

@@ -2,9 +2,11 @@
   is-agent="$ctrl.state.isAgent"
   host-details="$ctrl.hostDetails"
   engine-details="$ctrl.engineDetails"
-  refresh-url="docker.nodes.node"
   disks="$ctrl.disks"
   devices="$ctrl.devices"
+
+  refresh-url="docker.nodes.node"
+  browse-url="docker.nodes.node.browse"
 >
   <swarm-node-details-panel
     details="$ctrl.nodeDetails"

app/portainer/views/init/admin/initAdminController.js

@@ -43,4 +43,16 @@ function ($scope, $state, Notifications, Authentication, StateManager, UserServi
     });
   };
 
+  function createAdministratorFlow() {
+    UserService.administratorExists()
+    .then(function success(exists) {
+      if (exists) {
+        $state.go('portainer.home');
+      }
+    })
+    .catch(function error(err) {
+      Notifications.error('Failure', err, 'Unable to verify administrator account existence');
+    });
+  }
+  createAdministratorFlow();
 }]);