tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build cache_from option

Browse Source 
Signed-off-by: Kevin De Jong <kevin@tinymile.ai>
This commit is contained in:
Kevin De Jong 2021-09-29 14:30:02 -04:00 committed by Nicolas De loof
parent d2af460d81
commit 7365917244
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/compose/build.go
View File

@ -69,7 +69,6 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti
buildOptions.Pull = options.Pull buildOptions.Pull = options.Pull
buildOptions.BuildArgs = mergeArgs(buildOptions.BuildArgs, args) buildOptions.BuildArgs = mergeArgs(buildOptions.BuildArgs, args)
buildOptions.NoCache = options.NoCache buildOptions.NoCache = options.NoCache
opts[imageName] = buildOptions
buildOptions.CacheFrom, err = buildflags.ParseCacheEntry(service.Build.CacheFrom) buildOptions.CacheFrom, err = buildflags.ParseCacheEntry(service.Build.CacheFrom)
if err != nil { if err != nil {
return err return err
@ -81,6 +80,8 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti
Attrs: map[string]string{"ref": image}, Attrs: map[string]string{"ref": image},
}) })
} }
opts[imageName] = buildOptions
} }
} }