Explorar o código

Merge pull request #10099 from laurazard/use-defaultplatform-create

Use `DOCKER_DEFAULT_PLATFORM` to determine platform when creating container
Guillaume Lours %!s(int64=3) %!d(string=hai) anos
pai
achega
1e682a40ac
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      pkg/compose/convergence.go

+ 6 - 2
pkg/compose/convergence.go

@@ -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
 		}
 		}