Skip to content

Commit 1e682a4

Browse files
authored
Merge pull request docker#10099 from laurazard/use-defaultplatform-create
Use `DOCKER_DEFAULT_PLATFORM` to determine platform when creating container
2 parents c1ce53c + 7bc27d4 commit 1e682a4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/compose/convergence.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,14 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
479479
if err != nil {
480480
return created, err
481481
}
482+
platform := service.Platform
483+
if platform == "" {
484+
platform = project.Environment["DOCKER_DEFAULT_PLATFORM"]
485+
}
482486
var plat *specs.Platform
483-
if service.Platform != "" {
487+
if platform != "" {
484488
var p specs.Platform
485-
p, err = platforms.Parse(service.Platform)
489+
p, err = platforms.Parse(platform)
486490
if err != nil {
487491
return created, err
488492
}

0 commit comments

Comments
 (0)