deep-stack/kompose
4
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Support v2 restart unless-stopped (#1244)

Browse Source
This commit is contained in:
Hang Yan 2020-02-22 19:25:29 +08:00 committed by GitHub
parent 78908c94e5
commit 49d8133fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/loader/compose/v1v2.go
View File

@ -278,7 +278,6 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose
serviceConfig.Pid = composeServiceConfig.Pid serviceConfig.Pid = composeServiceConfig.Pid
serviceConfig.Privileged = composeServiceConfig.Privileged serviceConfig.Privileged = composeServiceConfig.Privileged
serviceConfig.Restart = composeServiceConfig.Restart
serviceConfig.User = composeServiceConfig.User serviceConfig.User = composeServiceConfig.User
serviceConfig.VolumesFrom = composeServiceConfig.VolumesFrom serviceConfig.VolumesFrom = composeServiceConfig.VolumesFrom
serviceConfig.Stdin = composeServiceConfig.StdinOpen serviceConfig.Stdin = composeServiceConfig.StdinOpen
@ -287,6 +286,13 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose
serviceConfig.TmpFs = composeServiceConfig.Tmpfs serviceConfig.TmpFs = composeServiceConfig.Tmpfs
serviceConfig.StopGracePeriod = composeServiceConfig.StopGracePeriod serviceConfig.StopGracePeriod = composeServiceConfig.StopGracePeriod
// pretty much same as v3
serviceConfig.Restart = composeServiceConfig.Restart
if serviceConfig.Restart == "unless-stopped" {
log.Warnf("Restart policy 'unless-stopped' in service %s is not supported, convert it to 'always'", name)
serviceConfig.Restart = "always"
}
if composeServiceConfig.Networks != nil { if composeServiceConfig.Networks != nil {
if len(composeServiceConfig.Networks.Networks) > 0 { if len(composeServiceConfig.Networks.Networks) > 0 {
for _, value := range composeServiceConfig.Networks.Networks { for _, value := range composeServiceConfig.Networks.Networks {