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

fix(service-details): allow to specify the 0 value for replicas (#441)

pull/442/head
Anthony Lapenna 2016-12-31 12:59:20 +13:00 committed by GitHub
parent 6e98237419
commit 51632e367c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/components/service/serviceController.js
View File

@ -25,7 +25,8 @@ function ($scope, $stateParams, $state, Service, ServiceHelper, Task, Node, Mess
service.EditImage = false; service.EditImage = false;
}; };
$scope.scaleService = function scaleService(service) { $scope.scaleService = function scaleService(service) {
updateServiceAttribute(service, 'Replicas', service.newServiceReplicas || service.Replicas); var replicas = service.newServiceReplicas === null || isNaN(service.newServiceReplicas) ? service.Replicas : service.newServiceReplicas;
updateServiceAttribute(service, 'Replicas', replicas);
service.EditReplicas = false; service.EditReplicas = false;
}; };

4
gruntfile.js
View File

@ -382,14 +382,14 @@ 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:2375 -d /data'
].join(';') ].join(';')
}, },
runSwarmLocal: { runSwarmLocal: {
command: [ command: [
'docker stop portainer', 'docker stop portainer',
'docker rm portainer', 'docker rm portainer',
'docker run -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name portainer portainer --swarm' 'docker run -d -p 9000:9000 -v /var/run/docker.sock:/var/run/docker.sock --name portainer portainer'
].join(';') ].join(';')
}, },
runSsl: { runSsl: {