diff --git a/pkg/compose/build.go b/pkg/compose/build.go index 57681454..9a582ec9 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -398,7 +398,7 @@ func useDockerDefaultPlatform(project *types.Project, platformList types.StringL var plats []specs.Platform if platform, ok := project.Environment["DOCKER_DEFAULT_PLATFORM"]; ok { if len(platformList) > 0 && !utils.StringContains(platformList, platform) { - return nil, fmt.Errorf("the DOCKER_DEFAULT_PLATFORM value should be part of the service.build.platforms: %q", platform) + return nil, fmt.Errorf("the DOCKER_DEFAULT_PLATFORM %q value should be part of the service.build.platforms: %q", platform, platformList) } p, err := platforms.Parse(platform) if err != nil { @@ -417,7 +417,7 @@ func useDockerDefaultOrServicePlatform(project *types.Project, service types.Ser if service.Platform != "" && !utils.StringContains(service.Build.Platforms, service.Platform) { if len(service.Build.Platforms) > 0 { - return nil, fmt.Errorf("service.platform should be part of the service.build.platforms: %q", service.Platform) + return nil, fmt.Errorf("service.platform %q should be part of the service.build.platforms: %q", service.Platform, service.Build.Platforms) } // User defined a service platform and no build platforms, so we should keep the one define on the service level p, err := platforms.Parse(service.Platform) diff --git a/pkg/e2e/build_test.go b/pkg/e2e/build_test.go index 0804a70c..4d58906d 100644 --- a/pkg/e2e/build_test.go +++ b/pkg/e2e/build_test.go @@ -366,7 +366,7 @@ func TestBuildPlatformsStandardErrors(t *testing.T) { "-f", "fixtures/build-test/platforms/compose-service-platform-not-in-build-platforms.yaml", "build") res.Assert(t, icmd.Expected{ ExitCode: 1, - Err: `service.platform should be part of the service.build.platforms: "linux/riscv64"`, + Err: `service.platform "linux/riscv64" should be part of the service.build.platforms: ["linux/amd64" "linux/arm64"]`, }) }) @@ -377,7 +377,7 @@ func TestBuildPlatformsStandardErrors(t *testing.T) { }) res.Assert(t, icmd.Expected{ ExitCode: 1, - Err: `DOCKER_DEFAULT_PLATFORM value should be part of the service.build.platforms: "windows/amd64"`, + Err: `DOCKER_DEFAULT_PLATFORM "windows/amd64" value should be part of the service.build.platforms: ["linux/amd64" "linux/arm64"]`, }) }) }