Merge branch 'release/1.10.1'

2016-11-16 23:17:46 +13:00 · 2016-11-16 23:17:46 +13:00 · 5af99c6fe3
parent 8c3f7b3ec2 2d35ac8f82
commit 5af99c6fe3
9 changed files with 61 additions and 14 deletions
--- a/README.md
+++ b/README.md
@ -7,6 +7,7 @@
 [![Microbadger](https://images.microbadger.com/badges/image/portainer/portainer.svg)](http://microbadger.com/images/portainer/portainer "Image size")
 [![Documentation Status](https://readthedocs.org/projects/portainer/badge/?version=latest)](http://portainer.readthedocs.io/en/latest/?badge=latest)
 [![Gitter](https://badges.gitter.im/portainer/Lobby.svg)](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YHXZJQNJQ36H6)

 **_Portainer_** is a lightweight management UI which allows you to **easily** manage your Docker host or Swarm cluster.

--- a/api/main.go
+++ b/api/main.go
@ -6,7 +6,7 @@ import (

 // main is the entry point of the program
 func main() {
-	kingpin.Version("1.10.0")
+	kingpin.Version("1.10.1")
 	var (
 		endpoint  = kingpin.Flag("host", "Dockerd endpoint").Default("unix:///var/run/docker.sock").Short('H').String()
 		addr      = kingpin.Flag("bind", "Address and port to serve Portainer").Default(":9000").Short('p').String()
--- a/app/app.js
+++ b/app/app.js
@ -188,4 +188,4 @@ angular.module('portainer', [
  .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('CONFIG_ENDPOINT', 'settings')
  .constant('TEMPLATES_ENDPOINT', 'templates')
-  .constant('UI_VERSION', 'v1.10.0');
+  .constant('UI_VERSION', 'v1.10.1');
--- a/app/components/createContainer/createContainerController.js
+++ b/app/components/createContainer/createContainerController.js
@ -1,12 +1,13 @@
 angular.module('createContainer', [])
-.controller('CreateContainerController', ['$scope', '$state', '$stateParams', 'Config', 'Info', 'Container', 'Image', 'Volume', 'Network', 'Messages',
-function ($scope, $state, $stateParams, Config, Info, Container, Image, Volume, Network, Messages) {
+.controller('CreateContainerController', ['$scope', '$state', '$stateParams', '$filter', 'Config', 'Info', 'Container', 'ContainerHelper', 'Image', 'Volume', 'Network', 'Messages',
+function ($scope, $state, $stateParams, $filter, Config, Info, Container, ContainerHelper, Image, Volume, Network, Messages) {

  $scope.formValues = {
    alwaysPull: true,
    Console: 'none',
    Volumes: [],
-    Registry: ''
+    Registry: '',
+    NetworkContainer: ''
  };

  $scope.imageConfig = {};
@ -51,12 +52,13 @@ function ($scope, $state, $stateParams, Config, Info, Container, Image, Volume,
  };

  Config.$promise.then(function (c) {
-    var swarm = c.swarm;
+    $scope.swarm = c.swarm;
    Info.get({}, function(info) {
-      if (swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
+      if ($scope.swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
        $scope.swarm_mode = true;
      }
    });
+    var containersToHideLabels = c.hiddenLabels;

    Volume.query({}, function (d) {
      $scope.availableVolumes = d.Volumes;
@ -66,7 +68,7 @@ function ($scope, $state, $stateParams, Config, Info, Container, Image, Volume,

    Network.query({}, function (d) {
      var networks = d;
-      if (swarm) {
+      if ($scope.swarm) {
        networks = d.filter(function (network) {
          if (network.Scope === 'global') {
            return network;
@ -77,6 +79,7 @@ function ($scope, $state, $stateParams, Config, Info, Container, Image, Volume,
        networks.push({Name: "host"});
        networks.push({Name: "none"});
      }
+      networks.push({Name: "container"});
      $scope.availableNetworks = networks;
      if (!_.find(networks, {'Name': 'bridge'})) {
        $scope.config.HostConfig.NetworkMode = 'nat';
@ -84,6 +87,16 @@ function ($scope, $state, $stateParams, Config, Info, Container, Image, Volume,
    }, function (e) {
      Messages.error("Failure", e, "Unable to retrieve networks");
    });
+
+    Container.query({}, function (d) {
+      var containers = d;
+      if (containersToHideLabels) {
+        containers = ContainerHelper.hideContainers(d, containersToHideLabels);
+      }
+      $scope.runningContainers = containers;
+    }, function(e) {
+      Messages.error("Failure", e, "Unable to retrieve running containers");
+    });
  });

  // TODO: centralize, already present in templatesController
@ -217,8 +230,26 @@ function ($scope, $state, $stateParams, Config, Info, Container, Image, Volume,
    config.Volumes = volumes;
  }

+  function prepareNetworkConfig(config) {
+    var mode = config.HostConfig.NetworkMode;
+    var container = $scope.formValues.NetworkContainer;
+    var containerName = container;
+    if (container && typeof container === 'object') {
+      containerName = $filter('trimcontainername')(container.Names[0]);
+      if ($scope.swarm && !$scope.swarm_mode) {
+        containerName = $filter('swarmcontainername')(container);
+      }
+    }
+    var networkMode = mode;
+    if (containerName) {
+      networkMode += ':' + containerName;
+    }
+    config.HostConfig.NetworkMode = networkMode;
+  }
+
  function prepareConfiguration() {
    var config = angular.copy($scope.config);
+    prepareNetworkConfig(config);
    prepareImageConfig(config);
    preparePortBindings(config);
    prepareConsole(config);
--- a/app/components/createContainer/createcontainer.html
+++ b/app/components/createContainer/createcontainer.html
@ -267,13 +267,26 @@
              <div class="form-group">
                <label for="container_network" class="col-sm-1 control-label text-left">Network</label>
                <div class="col-sm-9">
-                  <select class="selectpicker form-control" ng-model="config.HostConfig.NetworkMode">
+                  <select class="selectpicker form-control" ng-model="config.HostConfig.NetworkMode" id="container_network">
                    <option selected disabled hidden value="">Select a network</option>
                    <option ng-repeat="net in availableNetworks" ng-value="net.Name">{{ net.Name }}</option>
                  </select>
                </div>
              </div>
              <!-- !network-input -->
+              <!-- container-name-input -->
+              <div class="form-group" ng-if="config.HostConfig.NetworkMode == 'container'">
+                <label for="container_network_container" class="col-sm-1 control-label text-left">Container</label>
+                <div class="col-sm-9">
+                  <select ng-if="(!swarm || swarm && swarm_mode)" ng-options="container|containername for container in runningContainers" class="selectpicker form-control" ng-model="formValues.NetworkContainer">
+                    <option selected disabled hidden value="">Select a container</option>
+                  </select>
+                  <select ng-if="swarm && !swarm_mode" ng-options="container|swarmcontainername for container in runningContainers" class="selectpicker form-control" ng-model="formValues.NetworkContainer">
+                    <option selected disabled hidden value="">Select a container</option>
+                  </select>
+                </div>
+              </div>
+              <!-- !container-name-input -->
              <!-- hostname-input -->
              <div class="form-group">
                <label for="container_hostname" class="col-sm-1 control-label text-left">Hostname</label>
--- a/app/components/service/service.html
+++ b/app/components/service/service.html
@ -181,10 +181,10 @@
                </a>
              </th>
              <th>
-                <a ui-sref="service" ng-click="order('UpdatedAt')">
+                <a ui-sref="service" ng-click="order('Updated')">
                  Last update
-                  <span ng-show="sortType == 'UpdatedAt' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
-                  <span ng-show="sortType == 'UpdatedAt' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                  <span ng-show="sortType == 'Updated' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Updated' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                </a>
              </th>
            </tr>
--- a/bower.json
+++ b/bower.json
@ -1,6 +1,6 @@
 {
  "name": "portainer",
-  "version": "1.10.0",
+  "version": "1.10.1",
  "homepage": "https://github.com/portainer/portainer",
  "authors": [
    "Anthony Lapenna <anthony.lapenna at gmail dot com>"
--- a/build.sh
+++ b/build.sh
@ -18,12 +18,14 @@ rm -rf /tmp/portainer-build-win && mkdir -pv /tmp/portainer-build-win/portainer
 mv dist/* /tmp/portainer-build-win/portainer
 cd /tmp/portainer-build-win
 tar cvpfz portainer-${VERSION}-windows-amd64.tar.gz portainer
+cd -

 grunt release-arm
 rm -rf /tmp/portainer-build-arm && mkdir -pv /tmp/portainer-build-arm/portainer
 mv dist/* /tmp/portainer-build-arm/portainer
 cd /tmp/portainer-build-arm
 tar cvpfz portainer-${VERSION}-linux-arm.tar.gz portainer
+cd -

 grunt release-macos
 rm -rf /tmp/portainer-build-darwin && mkdir -pv /tmp/portainer-build-darwin/portainer
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "author": "Portainer.io",
  "name": "portainer",
  "homepage": "http://portainer.io",
-  "version": "1.10.0",
+  "version": "1.10.1",
  "repository": {
    "type": "git",
    "url": "git@github.com:portainer/portainer.git"