diff --git a/README.md b/README.md
index 6f778276e..47a495dad 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
[](http://microbadger.com/images/portainer/portainer "Image size")
[](http://portainer.readthedocs.io/en/latest/?badge=latest)
[](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[](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.
diff --git a/api/main.go b/api/main.go
index db8880480..fab02cf04 100644
--- 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()
diff --git a/app/app.js b/app/app.js
index 3a789fd9c..cf692c341 100644
--- 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');
diff --git a/app/components/createContainer/createContainerController.js b/app/components/createContainer/createContainerController.js
index 257062b97..9ea9ac735 100644
--- 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);
diff --git a/app/components/createContainer/createcontainer.html b/app/components/createContainer/createcontainer.html
index da82309d0..795ecfefa 100644
--- a/app/components/createContainer/createcontainer.html
+++ b/app/components/createContainer/createcontainer.html
@@ -267,13 +267,26 @@
+
+
+