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 #10099 from laurazard/use-defaultplatform-create 

Use `DOCKER_DEFAULT_PLATFORM` to determine platform when creating container
This commit is contained in:
Guillaume Lours 2022-12-19 14:17:49 +01:00 committed by GitHub
parent c1ce53c972 7bc27d441b
commit 1e682a40ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/compose/convergence.go
View File

@ -479,10 +479,14 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
if err != nil { if err != nil {
return created, err return created, err
} }
platform := service.Platform
if platform == "" {
platform = project.Environment["DOCKER_DEFAULT_PLATFORM"]
}
var plat *specs.Platform var plat *specs.Platform
if service.Platform != "" { if platform != "" {
var p specs.Platform var p specs.Platform
p, err = platforms.Parse(service.Platform) p, err = platforms.Parse(platform)
if err != nil { if err != nil {
return created, err return created, err
} }