tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2059 from ndeloof/volumes_from 

update project's volumes_from before retrieving service
This commit is contained in:
Ulysses Souza 2021-09-01 02:00:31 -07:00 committed by GitHub
parent 1ae9b3cb5d 81879c4f4b
commit 13dea3cef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/compose/run.go
View File

@ -127,6 +127,9 @@ func (s *composeService) runInteractive(ctx context.Context, containerID string,
} }
func (s *composeService) prepareRun(ctx context.Context, project *types.Project, opts api.RunOptions) (string, error) { func (s *composeService) prepareRun(ctx context.Context, project *types.Project, opts api.RunOptions) (string, error) {
if err := prepareVolumes(project); err != nil { // all dependencies already checked, but might miss service img
return "", err
}
service, err := project.GetService(opts.Service) service, err := project.GetService(opts.Service)
if err != nil { if err != nil {
return "", err return "", err
@ -146,9 +149,6 @@ func (s *composeService) prepareRun(ctx context.Context, project *types.Project,
} }
service.Labels = service.Labels.Add(api.SlugLabel, slug) service.Labels = service.Labels.Add(api.SlugLabel, slug)
service.Labels = service.Labels.Add(api.OneoffLabel, "True") service.Labels = service.Labels.Add(api.OneoffLabel, "True")
if err := prepareVolumes(project); err != nil { // all dependencies already checked, but might miss service img
return "", err
}
if err := s.ensureImagesExists(ctx, project, false); err != nil { // all dependencies already checked, but might miss service img if err := s.ensureImagesExists(ctx, project, false); err != nil { // all dependencies already checked, but might miss service img
return "", err return "", err