p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #26643 from allencloud/validate-two-service-modes-in-request

Browse Source 
return err when both two service modes in request
Upstream-commit: 1d8ad2974eb7dfe4f6f48c5fee28efa89cf6821f
Component: engine
This commit is contained in:
Vincent Demeester
2016-09-17 15:50:55 +02:00
committed by GitHub
parent 508525f5e5 a4d4b2606e
commit 19194e282c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/cluster/convert/service.go
View File

@ -185,7 +185,11 @@ func ServiceSpecToGRPC(s types.ServiceSpec) (swarmapi.ServiceSpec, error) {
}
}
//Mode
// Mode
if s.Mode.Global != nil && s.Mode.Replicated != nil {
return swarmapi.ServiceSpec{}, fmt.Errorf("cannot specify both replicated mode and global mode")
}
if s.Mode.Global != nil {
spec.Mode = &swarmapi.ServiceSpec_Global{
Global: &swarmapi.GlobalService{},