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

Revert "Add memory swap to swarm"

Browse Source 
This reverts commit 71828f2792.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2025-11-10 17:43:59 +01:00
parent ee244f2f44
commit e0716b571f
13 changed files with 11 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/compose/loader/full-example.yml
View File

@ -79,8 +79,6 @@ services:
- discrete_resource_spec:
kind: 'ssd'
value: 1
memswap_limit: 86000
mem_swappiness: 27
restart_policy:
condition: on-failure
delay: 5s

2
cli/compose/loader/full-struct_test.go
View File

@ -108,8 +108,6 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
},
},
},
MemswapLimit: int64Ptr(86000),
MemSwappiness: int64Ptr(27),
},
RestartPolicy: &types.RestartPolicy{
Condition: "on-failure",

4
cli/compose/loader/loader_test.go
View File

@ -970,10 +970,6 @@ func uint32Ptr(value uint32) *uint32 {
return &value
}
func int64Ptr(value int64) *int64 {
return &value
}
func TestFullExample(t *testing.T) {
skip.If(t, runtime.GOOS == "windows", "FIXME: substitutes platform-specific HOME-dirs and requires platform-specific golden files; see https://github.com/docker/cli/pull/4610")

4
cli/compose/loader/testdata/full-example.json.golden vendored
View File

@ -181,9 +181,7 @@
}
}
]
},
"memswap_limit": 86000,
"mem_swappiness": 27
}
},
"restart_policy": {
"condition": "on-failure",

2
cli/compose/loader/testdata/full-example.yaml.golden vendored
View File

@ -73,8 +73,6 @@ services:
- discrete_resource_spec:
kind: ssd
value: 1
memswap_limit: 86000
mem_swappiness: 27
restart_policy:
condition: on-failure
delay: 5s