github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(global): change the strategy used to determine if swarm mode is used

pull/227/head
Anthony Lapenna 2016-09-23 18:02:03 +12:00
parent fe63f9939a
commit e27282de3c
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/containers/containersController.js
View File

@ -152,7 +152,7 @@ function ($scope, Container, ContainerHelper, Info, Settings, Messages, Config)
$scope.swarm = c.swarm; $scope.swarm = c.swarm;
if (c.swarm) { if (c.swarm) {
Info.get({}, function (d) { Info.get({}, function (d) {
if (d.Swarm) { if (!_.startsWith(d.ServerVersion, 'swarm')) {
$scope.swarm_mode = true; $scope.swarm_mode = true;
} else { } else {
$scope.swarm_hosts = retrieveSwarmHostsInfo(d); $scope.swarm_hosts = retrieveSwarmHostsInfo(d);

2
app/components/createContainer/createContainerController.js
View File

@ -56,7 +56,7 @@ function ($scope, $state, Config, Info, Container, Image, Volume, Network, Messa
Config.$promise.then(function (c) { Config.$promise.then(function (c) {
var swarm = c.swarm; var swarm = c.swarm;
Info.get({}, function(info) { Info.get({}, function(info) {
if (swarm && info.Swarm) { if (swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
$scope.swarm_mode = true; $scope.swarm_mode = true;
} }
}); });

2
app/components/dashboard/dashboardController.js
View File

@ -64,7 +64,7 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
function prepareInfoData(d) { function prepareInfoData(d) {
var info = d; var info = d;
$scope.infoData = info; $scope.infoData = info;
if ($scope.swarm && info.Swarm) { if ($scope.swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
$scope.swarm_mode = true; $scope.swarm_mode = true;
} }
} }

2
app/components/dashboard/master-ctrl.js
View File

@ -15,7 +15,7 @@ function ($scope, $cookieStore, Settings, Config, Info) {
Config.$promise.then(function (c) { Config.$promise.then(function (c) {
$scope.swarm = c.swarm; $scope.swarm = c.swarm;
Info.get({}, function(d) { Info.get({}, function(d) {
if ($scope.swarm && d.Swarm) { if ($scope.swarm && !_.startsWith(d.ServerVersion, 'swarm')) {
$scope.swarm_mode = true; $scope.swarm_mode = true;
$scope.swarm_manager = false; $scope.swarm_manager = false;
if (d.Swarm.ControlAvailable) { if (d.Swarm.ControlAvailable) {

2
app/components/swarm/swarmController.js
View File

@ -22,7 +22,7 @@ function ($scope, Info, Version, Node) {
Info.get({}, function (d) { Info.get({}, function (d) {
$scope.info = d; $scope.info = d;
if (d.Swarm) { if (!_.startsWith(d.ServerVersion, 'swarm')) {
$scope.swarm_mode = true; $scope.swarm_mode = true;
Node.query({}, function(d) { Node.query({}, function(d) {
$scope.nodes = d; $scope.nodes = d;

2
app/components/templates/templatesController.js
View File

@ -166,7 +166,7 @@ function ($scope, $q, $state, $filter, Config, Info, Container, ContainerHelper,
Config.$promise.then(function (c) { Config.$promise.then(function (c) {
$scope.swarm = c.swarm; $scope.swarm = c.swarm;
Info.get({}, function(info) { Info.get({}, function(info) {
if ($scope.swarm && info.Swarm) { if ($scope.swarm && !_.startsWith(info.ServerVersion, 'swarm')) {
$scope.swarm_mode = true; $scope.swarm_mode = true;
} }
}); });

2
gruntFile.js
View File

@ -274,7 +274,7 @@ module.exports = function (grunt) {
command: [ command: [
'docker stop portainer', 'docker stop portainer',
'docker rm portainer', 'docker rm portainer',
'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:2375 --swarm -d /data' 'docker run -d -p 9000:9000 -v /tmp/portainer:/data --name portainer portainer -H tcp://10.0.7.10:4000 --swarm -d /data'
].join(';') ].join(';')
}, },
runSsl: { runSsl: {