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 #1529 from docker/auth

This commit is contained in:
Nicolas De loof 2021-04-13 10:33:14 +02:00 committed by GitHub
parent 184c2b8c1a 26b8ef0f49
commit 74773b9062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
local/compose/build.go
View File

@ -30,12 +30,14 @@ import (
"github.com/docker/buildx/driver" "github.com/docker/buildx/driver"
_ "github.com/docker/buildx/driver/docker" // required to get default driver registered _ "github.com/docker/buildx/driver/docker" // required to get default driver registered
"github.com/docker/buildx/util/progress" "github.com/docker/buildx/util/progress"
cliconfig "github.com/docker/cli/cli/config"
moby "github.com/docker/docker/api/types" moby "github.com/docker/docker/api/types"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
bclient "github.com/moby/buildkit/client" bclient "github.com/moby/buildkit/client"
specs "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/config"
composeprogress "github.com/docker/compose-cli/api/progress" composeprogress "github.com/docker/compose-cli/api/progress"
"github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/metrics"
"github.com/docker/compose-cli/utils" "github.com/docker/compose-cli/utils"
@ -167,7 +169,13 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opts
return nil return nil
} }
const drivername = "default" const drivername = "default"
d, err := driver.GetDriver(ctx, drivername, nil, s.apiClient, nil, nil, nil, "", nil, nil, project.WorkingDir)
configFile, err := cliconfig.Load(config.Dir())
if err != nil {
return err
}
d, err := driver.GetDriver(ctx, drivername, nil, s.apiClient, configFile, nil, nil, "", nil, nil, project.WorkingDir)
if err != nil { if err != nil {
return err return err
} }