Merge pull request #1821 from ndeloof/autoremove_restart_policy

Don't apply restart_policy on `compose run`
docker-archive · Jun 21, 2021 · 6bfdfa8 · 6bfdfa8
2 parents 796d08d + 852aae0
commit 6bfdfa8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkg/compose/convergence.go b/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,
 	})

diff --git a/pkg/compose/run.go b/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")