diff --git a/cmd/compose/build.go b/cmd/compose/build.go index e6a2c6ca3..9393745e0 100644 --- a/cmd/compose/build.go +++ b/cmd/compose/build.go @@ -46,7 +46,7 @@ type buildOptions struct { deps bool print bool check bool - provenance string + provenance bool } func (opts buildOptions) toAPIBuildOptions(services []string) (api.BuildOptions, error) { @@ -70,11 +70,6 @@ func (opts buildOptions) toAPIBuildOptions(services []string) (api.BuildOptions, if uiMode == ui.ModeJSON { uiMode = "rawjson" } - var provenance *string - // empty when set by up, run or create functions and "none" when set by the user from the build command - if opts.provenance != "" && opts.provenance != "none" { - provenance = &opts.provenance - } return api.BuildOptions{ Pull: opts.pull, @@ -90,7 +85,7 @@ func (opts buildOptions) toAPIBuildOptions(services []string) (api.BuildOptions, Check: opts.check, SSHs: SSHKeys, Builder: builderName, - Provenance: provenance, + Provenance: opts.provenance, }, nil } @@ -131,7 +126,6 @@ func buildCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) flags.StringVar(&opts.ssh, "ssh", "", "Set SSH authentications used when building service images. (use 'default' for using your default SSH Agent)") flags.StringVar(&opts.builder, "builder", "", "Set builder to use") flags.BoolVar(&opts.deps, "with-dependencies", false, "Also build dependencies (transitively)") - flags.StringVar(&opts.provenance, "provenance", "min", "Set provenance mode (none|min|max)") flags.Bool("parallel", true, "Build images in parallel. DEPRECATED") flags.MarkHidden("parallel") //nolint:errcheck @@ -162,6 +156,7 @@ func runBuild(ctx context.Context, dockerCli command.Cli, backend api.Service, o } apiBuildOptions, err := opts.toAPIBuildOptions(services) + apiBuildOptions.Provenance = true if err != nil { return err } diff --git a/docs/reference/compose_build.md b/docs/reference/compose_build.md index 0d1d2e958..5589a4693 100644 --- a/docs/reference/compose_build.md +++ b/docs/reference/compose_build.md @@ -22,7 +22,6 @@ run `docker compose build` to rebuild it. | `-m`, `--memory` | `bytes` | `0` | Set memory limit for the build container. Not supported by BuildKit. | | `--no-cache` | `bool` | | Do not use cache when building the image | | `--print` | `bool` | | Print equivalent bake file | -| `--provenance` | `string` | `max` | Set provenance mode (none\|min\|max) | | `--pull` | `bool` | | Always attempt to pull a newer version of the image | | `--push` | `bool` | | Push service images | | `-q`, `--quiet` | `bool` | | Don't print anything to STDOUT | diff --git a/docs/reference/docker_compose_build.yaml b/docs/reference/docker_compose_build.yaml index 707b84e4c..1197d5314 100644 --- a/docs/reference/docker_compose_build.yaml +++ b/docs/reference/docker_compose_build.yaml @@ -126,16 +126,6 @@ options: experimentalcli: false kubernetes: false swarm: false - - option: provenance - value_type: string - default_value: max - description: Set provenance mode (none|min|max) - deprecated: false - hidden: false - experimental: false - experimentalcli: false - kubernetes: false - swarm: false - option: pull value_type: bool default_value: "false" diff --git a/pkg/api/api.go b/pkg/api/api.go index 5ff4c4ff0..d4d540be2 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -160,7 +160,7 @@ type BuildOptions struct { // Check let builder validate build configuration Check bool // Provenance - Provenance *string + Provenance bool } // Apply mutates project according to build options diff --git a/pkg/compose/build.go b/pkg/compose/build.go index 790cb9b74..4666bacb0 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -482,7 +482,9 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se } attests := map[string]*string{} - attests["provenance"] = options.Provenance + if !options.Provenance { + attests["provenance"] = nil + } return build.Options{ Inputs: build.Inputs{