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

Refactoring

Browse Source 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
Ulysses Souza 2021-10-31 02:01:30 +02:00 committed by Nicolas De loof
parent 0f3c214b48
commit 06c5d8a902
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/compose/build_classic.go
View File

@ -114,7 +114,7 @@ func (s *composeService) doBuildClassicSimpleImage(ctx context.Context, options
} }
if err := build.ValidateContextDirectory(contextDir, excludes); err != nil { if err := build.ValidateContextDirectory(contextDir, excludes); err != nil {
return "", errors.Errorf("error checking context: '%s'.", err) return "", errors.Wrap(err, "checking context")
} }
// And canonicalize dockerfile name to a platform-independent one // And canonicalize dockerfile name to a platform-independent one
@ -123,7 +123,7 @@ func (s *composeService) doBuildClassicSimpleImage(ctx context.Context, options
excludes = build.TrimBuildFilesFromExcludes(excludes, relDockerfile, false) excludes = build.TrimBuildFilesFromExcludes(excludes, relDockerfile, false)
buildCtx, err = archive.TarWithOptions(contextDir, &archive.TarOptions{ buildCtx, err = archive.TarWithOptions(contextDir, &archive.TarOptions{
ExcludePatterns: excludes, ExcludePatterns: excludes,
ChownOpts: &idtools.Identity{UID: 0, GID: 0}, ChownOpts: &idtools.Identity{},
}) })
if err != nil { if err != nil {
return "", err return "", err
@ -156,7 +156,10 @@ func (s *composeService) doBuildClassicSimpleImage(ctx context.Context, options
} }
configFile := s.configFile configFile := s.configFile
creds, _ := configFile.GetAllCredentials() creds, err := configFile.GetAllCredentials()
if err != nil {
return "", err
}
authConfigs := make(map[string]dockertypes.AuthConfig, len(creds)) authConfigs := make(map[string]dockertypes.AuthConfig, len(creds))
for k, auth := range creds { for k, auth := range creds {
authConfigs[k] = dockertypes.AuthConfig(auth) authConfigs[k] = dockertypes.AuthConfig(auth)
@ -240,24 +243,7 @@ func imageBuildOptions(options buildx.Options) dockertypes.ImageBuildOptions {
func toMapStringStringPtr(source map[string]string) map[string]*string { func toMapStringStringPtr(source map[string]string) map[string]*string {
dest := make(map[string]*string) dest := make(map[string]*string)
for k, v := range source { for k, v := range source {
v := v
dest[k] = &v dest[k] = &v
} }
return dest return dest
} }
// lastProgressOutput is the same as progress.Output except
// that it only output with the last update. It is used in
// non terminal scenarios to suppress verbose messages
type lastProgressOutput struct {
output progress.Output
}
// WriteProgress formats progress information from a ProgressReader.
func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error {
if !prog.LastUpdate {
return nil
}
return out.output.WriteProgress(prog)
}