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

feat(templates): add the ability to connect a template to swarm attachable networks (#642)

pull/751/head^2
Thomas Krzero 2017-03-31 22:12:58 +02:00 committed by Anthony Lapenna
parent ffca440135
commit 53f31ba3b8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,11 @@ function ($scope, $q, $state, $anchorScroll, Config, ContainerService, Container
function filterNetworksBasedOnProvider(networks) { function filterNetworksBasedOnProvider(networks) {
var endpointProvider = $scope.applicationState.endpoint.mode.provider; var endpointProvider = $scope.applicationState.endpoint.mode.provider;
if (endpointProvider === 'DOCKER_SWARM' || endpointProvider === 'DOCKER_SWARM_MODE') { if (endpointProvider === 'DOCKER_SWARM' || endpointProvider === 'DOCKER_SWARM_MODE') {
networks = NetworkService.filterGlobalNetworks(networks); if (endpointProvider === 'DOCKER_SWARM') {
networks = NetworkService.filterGlobalNetworks(networks);
} else {
networks = NetworkService.filterSwarmModeAttachableNetworks(networks);
}
$scope.globalNetworkCount = networks.length; $scope.globalNetworkCount = networks.length;
NetworkService.addPredefinedLocalNetworks(networks); NetworkService.addPredefinedLocalNetworks(networks);
} }

8
app/services/networkService.js
View File

@ -15,6 +15,14 @@ angular.module('portainer.services')
}); });
}; };
service.filterSwarmModeAttachableNetworks = function(networks) {
return networks.filter(function (network) {
if (network.Scope === 'swarm' && network.Attachable === true) {
return network;
}
});
};
service.addPredefinedLocalNetworks = function(networks) { service.addPredefinedLocalNetworks = function(networks) {
networks.push({Scope: "local", Name: "bridge"}); networks.push({Scope: "local", Name: "bridge"});
networks.push({Scope: "local", Name: "host"}); networks.push({Scope: "local", Name: "host"});