浏览代码

don't apply restart_policy on `compose run`

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 4 年之前
父节点
当前提交
852aae0a39
共有 2 个文件被更改,包括 5 次插入0 次删除
  1. 1 0
      pkg/compose/convergence.go
  2. 4 0
      pkg/compose/run.go

+ 1 - 0
pkg/compose/convergence.go

@@ -470,6 +470,7 @@ func (s *composeService) startService(ctx context.Context, project *types.Projec
 		Filters: filters.NewArgs(
 			projectFilter(project.Name),
 			serviceFilter(service.Name),
+			oneOffFilter(false),
 		),
 		All: true,
 	})

+ 4 - 0
pkg/compose/run.go

@@ -50,6 +50,10 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
 	}
 	service.Scale = 1
 	service.StdinOpen = true
+	service.Restart = ""
+	if service.Deploy != nil {
+		service.Deploy.RestartPolicy = nil
+	}
 	service.Labels = service.Labels.Add(api.SlugLabel, slug)
 	service.Labels = service.Labels.Add(api.OneoffLabel, "True")