diff --git a/bake/bake.go b/bake/bake.go index 786ea9ed6bbb..b523dd13fb1b 100644 --- a/bake/bake.go +++ b/bake/bake.go @@ -554,9 +554,9 @@ func (c Config) newOverrides(v []string) (map[string]map[string]Override, error) o.Value = v } fallthrough - case "contexts": + case "contexts", "opts": if len(keys) != 3 { - return nil, errors.Errorf("invalid key %s, contexts requires name", parts[0]) + return nil, errors.Errorf("invalid key %s, %s requires name", parts[0], keys[1]) } fallthrough default: @@ -699,6 +699,7 @@ type Target struct { NoCache *bool `json:"no-cache,omitempty" hcl:"no-cache,optional" cty:"no-cache"` NetworkMode *string `json:"-" hcl:"-" cty:"-"` NoCacheFilter []string `json:"no-cache-filter,omitempty" hcl:"no-cache-filter,optional" cty:"no-cache-filter"` + Opts map[string]string `json:"opts,omitempty" hcl:"opts,optional" cty:"opts"` // IMPORTANT: if you add more fields here, do not forget to update newOverrides and docs/bake-reference.md. // linked is a private field to mark a target used as a linked one @@ -809,6 +810,12 @@ func (t *Target) Merge(t2 *Target) { if t2.NoCacheFilter != nil { // merge t.NoCacheFilter = append(t.NoCacheFilter, t2.NoCacheFilter...) } + for k, v := range t2.Opts { + if t.Opts == nil { + t.Opts = map[string]string{} + } + t.Opts[k] = v + } t.Inherits = append(t.Inherits, t2.Inherits...) } @@ -893,6 +900,14 @@ func (t *Target) AddOverrides(overrides map[string]Override) error { } } } + case "opts": + if len(keys) != 2 { + return errors.Errorf("opts require name") + } + if t.Opts == nil { + t.Opts = map[string]string{} + } + t.Opts[keys[1]] = value default: return errors.Errorf("unknown key: %s", keys[0]) } @@ -1244,6 +1259,7 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) { Pull: pull, NetworkMode: networkMode, Linked: t.linked, + RawOpts: t.Opts, } platforms, err := platformutil.Parse(t.Platforms) diff --git a/build/build.go b/build/build.go index 6a18091ce67a..2ccae5a59f10 100644 --- a/build/build.go +++ b/build/build.go @@ -97,6 +97,8 @@ type Options struct { PrintFunc *PrintFunc SourcePolicy *spb.Policy GroupRef string + + RawOpts map[string]string } type PrintFunc struct { @@ -226,6 +228,16 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op AllowedEntitlements: opt.Allow, SourcePolicy: opt.SourcePolicy, } + if opt.RawOpts != nil { + defer func() { + for k, v := range opt.RawOpts { + if oldV, ok := so.FrontendAttrs[k]; ok { + logrus.Debugf("Overriding frontend opt %s=%q with %q", k, oldV, v) + } + so.FrontendAttrs[k] = v + } + }() + } if so.Ref == "" { so.Ref = identity.NewID() diff --git a/commands/build.go b/commands/build.go index d3f4addb0d85..bc4a21063473 100644 --- a/commands/build.go +++ b/commands/build.go @@ -105,6 +105,8 @@ type buildOptions struct { control.ControlOptions invokeConfig *invokeConfig + + rawOpts []string } func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error) { @@ -120,6 +122,11 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error return nil, err } + rawOpts, err := listToMap(o.rawOpts, true) + if err != nil { + return nil, err + } + opts := controllerapi.BuildOptions{ Allow: o.allow, Annotations: o.annotations, @@ -141,6 +148,7 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error Pull: o.pull, ExportPush: o.exportPush, ExportLoad: o.exportLoad, + RawOpts: rawOpts, } // TODO: extract env var parsing to a method easily usable by library consumers @@ -590,7 +598,8 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugConfig *debug.D if isExperimental() { flags.StringVar(&options.printFunc, "print", "", "Print result of information request (e.g., outline, targets)") - cobrautil.MarkFlagsExperimental(flags, "print") + flags.StringArrayVar(&options.rawOpts, "opt", []string{}, "Set BuildKit frontend option directly") + cobrautil.MarkFlagsExperimental(flags, "print", "opt") } flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--output=type=registry"`) diff --git a/controller/build/build.go b/controller/build/build.go index 3629982b0b72..d2bdac147873 100644 --- a/controller/build/build.go +++ b/controller/build/build.go @@ -67,6 +67,7 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.Build Target: in.Target, Ulimits: controllerUlimitOpt2DockerUlimit(in.Ulimits), GroupRef: in.GroupRef, + RawOpts: in.RawOpts, } platforms, err := platformutil.Parse(in.Platforms) diff --git a/controller/pb/controller.pb.go b/controller/pb/controller.pb.go index e32ca4deb67c..5c23df93d9f6 100644 --- a/controller/pb/controller.pb.go +++ b/controller/pb/controller.pb.go @@ -302,6 +302,7 @@ type BuildOptions struct { Ref string `protobuf:"bytes,29,opt,name=Ref,proto3" json:"Ref,omitempty"` GroupRef string `protobuf:"bytes,30,opt,name=GroupRef,proto3" json:"GroupRef,omitempty"` Annotations []string `protobuf:"bytes,31,rep,name=Annotations,proto3" json:"Annotations,omitempty"` + RawOpts map[string]string `protobuf:"bytes,32,rep,name=RawOpts,proto3" json:"RawOpts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -548,6 +549,13 @@ func (m *BuildOptions) GetAnnotations() []string { return nil } +func (m *BuildOptions) GetRawOpts() map[string]string { + if m != nil { + return m.RawOpts + } + return nil +} + type ExportEntry struct { Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"` Attrs map[string]string `protobuf:"bytes,2,rep,name=Attrs,proto3" json:"Attrs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -2039,6 +2047,7 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "buildx.controller.v1.BuildOptions.BuildArgsEntry") proto.RegisterMapType((map[string]string)(nil), "buildx.controller.v1.BuildOptions.LabelsEntry") proto.RegisterMapType((map[string]string)(nil), "buildx.controller.v1.BuildOptions.NamedContextsEntry") + proto.RegisterMapType((map[string]string)(nil), "buildx.controller.v1.BuildOptions.RawOptsEntry") proto.RegisterType((*ExportEntry)(nil), "buildx.controller.v1.ExportEntry") proto.RegisterMapType((map[string]string)(nil), "buildx.controller.v1.ExportEntry.AttrsEntry") proto.RegisterType((*CacheOptionsEntry)(nil), "buildx.controller.v1.CacheOptionsEntry") @@ -2078,128 +2087,129 @@ func init() { func init() { proto.RegisterFile("controller.proto", fileDescriptor_ed7f10298fa1d90f) } var fileDescriptor_ed7f10298fa1d90f = []byte{ - // 1922 bytes of a gzipped FileDescriptorProto + // 1951 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x5f, 0x73, 0x1b, 0x49, - 0x11, 0x67, 0x25, 0x59, 0x7f, 0x5a, 0x96, 0xcf, 0x19, 0x9c, 0x30, 0xd9, 0xe4, 0x12, 0x67, 0x93, - 0x1c, 0x2a, 0x42, 0xc9, 0x77, 0x3e, 0x82, 0x2f, 0x97, 0xbb, 0x2a, 0x6c, 0xd9, 0xc2, 0xbe, 0x4a, - 0x6c, 0xd7, 0xca, 0xc9, 0x15, 0x50, 0xc5, 0xd5, 0x5a, 0x1a, 0xcb, 0x5b, 0x5a, 0xed, 0x88, 0x9d, - 0x91, 0x6d, 0xf1, 0xc4, 0x03, 0xbc, 0x51, 0x14, 0x5f, 0x83, 0xe2, 0x23, 0xf0, 0xc4, 0x37, 0xe2, - 0x23, 0x50, 0xd3, 0x33, 0xbb, 0x5a, 0x59, 0x5a, 0xd9, 0x86, 0x27, 0x4d, 0xf7, 0xfe, 0xba, 0x7b, - 0xba, 0xa7, 0xa7, 0xbb, 0x47, 0xb0, 0xda, 0xe1, 0xa1, 0x8c, 0x78, 0x10, 0xb0, 0xa8, 0x31, 0x8c, - 0xb8, 0xe4, 0x64, 0xed, 0x74, 0xe4, 0x07, 0xdd, 0xab, 0x46, 0xea, 0xc3, 0xc5, 0x17, 0xf6, 0xdb, - 0x9e, 0x2f, 0xcf, 0x47, 0xa7, 0x8d, 0x0e, 0x1f, 0x6c, 0x0c, 0xf8, 0xe9, 0x78, 0x03, 0x51, 0x7d, - 0x5f, 0x6e, 0x78, 0x43, 0x7f, 0x43, 0xb0, 0xe8, 0xc2, 0xef, 0x30, 0xb1, 0x61, 0x84, 0xe2, 0x5f, - 0xad, 0xd2, 0x7e, 0x9d, 0x29, 0x2c, 0xf8, 0x28, 0xea, 0xb0, 0x21, 0x0f, 0xfc, 0xce, 0x78, 0x63, - 0x78, 0xba, 0xa1, 0x57, 0x5a, 0xcc, 0xa9, 0xc3, 0xda, 0x3b, 0x5f, 0xc8, 0xe3, 0x88, 0x77, 0x98, - 0x10, 0x4c, 0xb8, 0xec, 0x0f, 0x23, 0x26, 0x24, 0x59, 0x85, 0xbc, 0xcb, 0xce, 0xa8, 0xb5, 0x6e, - 0xd5, 0x2b, 0xae, 0x5a, 0x3a, 0xc7, 0x70, 0xff, 0x1a, 0x52, 0x0c, 0x79, 0x28, 0x18, 0xd9, 0x82, - 0xa5, 0x83, 0xf0, 0x8c, 0x0b, 0x6a, 0xad, 0xe7, 0xeb, 0xd5, 0xcd, 0x67, 0x8d, 0x79, 0xce, 0x35, - 0x8c, 0x9c, 0x42, 0xba, 0x1a, 0xef, 0x08, 0xa8, 0xa6, 0xb8, 0xe4, 0x31, 0x54, 0x62, 0x72, 0xd7, - 0x18, 0x9e, 0x30, 0x48, 0x0b, 0x96, 0x0f, 0xc2, 0x0b, 0xde, 0x67, 0x4d, 0x1e, 0x9e, 0xf9, 0x3d, - 0x9a, 0x5b, 0xb7, 0xea, 0xd5, 0x4d, 0x67, 0xbe, 0xb1, 0x34, 0xd2, 0x9d, 0x92, 0x73, 0xbe, 0x03, - 0xba, 0xeb, 0x8b, 0x0e, 0x0f, 0x43, 0xd6, 0x89, 0x9d, 0xc9, 0x74, 0x7a, 0x7a, 0x4f, 0xb9, 0x6b, - 0x7b, 0x72, 0x1e, 0xc1, 0xc3, 0x39, 0xba, 0x74, 0x58, 0x9c, 0xdf, 0xc3, 0xf2, 0x8e, 0xda, 0x5b, - 0xb6, 0xf2, 0x6f, 0xa0, 0x74, 0x34, 0x94, 0x3e, 0x0f, 0xc5, 0x62, 0x6f, 0x50, 0x8d, 0x41, 0xba, - 0xb1, 0x88, 0xf3, 0xf7, 0x65, 0x63, 0xc0, 0x30, 0xc8, 0x3a, 0x54, 0x9b, 0x3c, 0x94, 0xec, 0x4a, - 0x1e, 0x7b, 0xf2, 0xdc, 0x18, 0x4a, 0xb3, 0xc8, 0x67, 0xb0, 0xb2, 0xcb, 0x3b, 0x7d, 0x16, 0x9d, - 0xf9, 0x01, 0x3b, 0xf4, 0x06, 0xcc, 0xb8, 0x74, 0x8d, 0x4b, 0xbe, 0x55, 0x5e, 0xfb, 0xa1, 0x6c, - 0x8d, 0xc2, 0x0e, 0xcd, 0xe3, 0xd6, 0x9e, 0x66, 0x9d, 0xaa, 0x81, 0xb9, 0x13, 0x09, 0xf2, 0x3b, - 0xa8, 0x29, 0x35, 0x5d, 0x63, 0x5a, 0xd0, 0x02, 0x26, 0xc6, 0xeb, 0x9b, 0xbd, 0x6b, 0x4c, 0xc9, - 0xed, 0x85, 0x32, 0x1a, 0xbb, 0xd3, 0xba, 0xc8, 0x1a, 0x2c, 0x6d, 0x07, 0x01, 0xbf, 0xa4, 0x4b, - 0xeb, 0xf9, 0x7a, 0xc5, 0xd5, 0x04, 0xf9, 0x25, 0x94, 0xb6, 0xa5, 0x64, 0x42, 0x0a, 0x5a, 0x44, - 0x63, 0x8f, 0xe7, 0x1b, 0xd3, 0x20, 0x37, 0x06, 0x93, 0x23, 0xa8, 0xa0, 0xfd, 0xed, 0xa8, 0x27, - 0x68, 0x09, 0x25, 0xbf, 0xb8, 0xc5, 0x36, 0x13, 0x19, 0xbd, 0xc5, 0x89, 0x0e, 0xb2, 0x07, 0x95, - 0xa6, 0xd7, 0x39, 0x67, 0xad, 0x88, 0x0f, 0x68, 0x19, 0x15, 0xfe, 0x74, 0xbe, 0x42, 0x84, 0x19, - 0x85, 0x46, 0x4d, 0x22, 0x49, 0xb6, 0xa1, 0x84, 0xc4, 0x09, 0xa7, 0x95, 0xbb, 0x29, 0x89, 0xe5, - 0x88, 0x03, 0xcb, 0xcd, 0x5e, 0xc4, 0x47, 0xc3, 0x63, 0x2f, 0x62, 0xa1, 0xa4, 0x80, 0x47, 0x3d, - 0xc5, 0x23, 0x6f, 0xa1, 0xb4, 0x77, 0x35, 0xe4, 0x91, 0x14, 0xb4, 0xba, 0xe8, 0xf2, 0x6a, 0x90, - 0x31, 0x60, 0x24, 0xc8, 0x13, 0x80, 0xbd, 0x2b, 0x19, 0x79, 0xfb, 0x5c, 0x85, 0x7d, 0x19, 0x8f, - 0x23, 0xc5, 0x21, 0x2d, 0x28, 0xbe, 0xf3, 0x4e, 0x59, 0x20, 0x68, 0x0d, 0x75, 0x37, 0x6e, 0x11, - 0x58, 0x2d, 0xa0, 0x0d, 0x19, 0x69, 0x95, 0xd7, 0x87, 0x4c, 0x5e, 0xf2, 0xa8, 0xff, 0x9e, 0x77, - 0x19, 0x5d, 0xd1, 0x79, 0x9d, 0x62, 0x91, 0x17, 0x50, 0x3b, 0xe4, 0x3a, 0x78, 0x7e, 0x20, 0x59, - 0x44, 0x3f, 0xc1, 0xcd, 0x4c, 0x33, 0xf1, 0x2e, 0x07, 0x9e, 0x3c, 0xe3, 0xd1, 0x40, 0xd0, 0x55, - 0x44, 0x4c, 0x18, 0x2a, 0x83, 0xda, 0xac, 0x13, 0x31, 0x29, 0xe8, 0xbd, 0x45, 0x19, 0xa4, 0x41, - 0x6e, 0x0c, 0x26, 0x14, 0x4a, 0xed, 0xf3, 0x41, 0xdb, 0xff, 0x23, 0xa3, 0x64, 0xdd, 0xaa, 0xe7, - 0xdd, 0x98, 0x24, 0xaf, 0x20, 0xdf, 0x6e, 0xef, 0xd3, 0x1f, 0xa3, 0xb6, 0x87, 0x19, 0xda, 0xda, - 0xfb, 0xae, 0x42, 0x11, 0x02, 0x85, 0x13, 0xaf, 0x27, 0xe8, 0x1a, 0xee, 0x0b, 0xd7, 0xe4, 0x01, - 0x14, 0x4f, 0xbc, 0xa8, 0xc7, 0x24, 0xbd, 0x8f, 0x3e, 0x1b, 0x8a, 0xbc, 0x81, 0xd2, 0x87, 0xc0, - 0x1f, 0xf8, 0x52, 0xd0, 0x07, 0x8b, 0x2e, 0xa7, 0x06, 0x1d, 0x0d, 0xa5, 0x1b, 0xe3, 0xd5, 0x6e, - 0x31, 0xde, 0x2c, 0xa2, 0x3f, 0x41, 0x9d, 0x31, 0xa9, 0xbe, 0x98, 0x70, 0x51, 0xba, 0x6e, 0xd5, - 0xcb, 0x6e, 0x4c, 0xaa, 0xad, 0x1d, 0x8f, 0x82, 0x80, 0x3e, 0x44, 0x36, 0xae, 0xf5, 0xd9, 0xab, - 0x34, 0x38, 0x1e, 0x89, 0x73, 0x6a, 0xe3, 0x97, 0x14, 0x67, 0xf2, 0xfd, 0x1d, 0xf7, 0xba, 0xf4, - 0x51, 0xfa, 0xbb, 0xe2, 0x90, 0x03, 0x58, 0x6e, 0x63, 0x5b, 0x3a, 0xc6, 0x66, 0x44, 0x1f, 0xa3, - 0x1f, 0x2f, 0x1b, 0xaa, 0x73, 0x35, 0xe2, 0xce, 0xa5, 0x7c, 0x48, 0x37, 0xaf, 0x86, 0x06, 0xbb, - 0x53, 0xa2, 0x71, 0x5d, 0xfd, 0x74, 0x52, 0x57, 0x6d, 0x28, 0xff, 0x5a, 0x25, 0xb9, 0x62, 0x3f, - 0x41, 0x76, 0x42, 0xab, 0x64, 0xda, 0x0e, 0x43, 0x2e, 0x3d, 0x5d, 0x77, 0x9f, 0x62, 0xb8, 0xd3, - 0x2c, 0xfb, 0x57, 0x40, 0x66, 0xab, 0x90, 0xb2, 0xd2, 0x67, 0xe3, 0xb8, 0x7a, 0xf7, 0xd9, 0x58, - 0x15, 0xa2, 0x0b, 0x2f, 0x18, 0xc5, 0x35, 0x54, 0x13, 0x5f, 0xe7, 0xbe, 0xb2, 0xec, 0x6f, 0x60, - 0x65, 0xba, 0x40, 0xdc, 0x49, 0xfa, 0x0d, 0x54, 0x53, 0xb7, 0xe0, 0x2e, 0xa2, 0xce, 0xbf, 0x2d, - 0xa8, 0xa6, 0xae, 0x2a, 0x26, 0xd5, 0x78, 0xc8, 0x8c, 0x30, 0xae, 0xc9, 0x0e, 0x2c, 0x6d, 0x4b, - 0x19, 0xa9, 0x96, 0xa3, 0xf2, 0xf2, 0xe7, 0x37, 0x5e, 0xf8, 0x06, 0xc2, 0xf5, 0x95, 0xd4, 0xa2, - 0x2a, 0x88, 0xbb, 0x4c, 0x48, 0x3f, 0xc4, 0x90, 0x61, 0x87, 0xa8, 0xb8, 0x69, 0x96, 0xfd, 0x15, - 0xc0, 0x44, 0xec, 0x4e, 0x3e, 0xfc, 0xd3, 0x82, 0x7b, 0x33, 0x55, 0x6d, 0xae, 0x27, 0xfb, 0xd3, - 0x9e, 0x6c, 0xde, 0xb2, 0x42, 0xce, 0xfa, 0xf3, 0x7f, 0xec, 0xf6, 0x10, 0x8a, 0xba, 0x95, 0xcc, - 0xdd, 0xa1, 0x0d, 0xe5, 0x5d, 0x5f, 0x78, 0xa7, 0x01, 0xeb, 0xa2, 0x68, 0xd9, 0x4d, 0x68, 0xec, - 0x63, 0xb8, 0x7b, 0x1d, 0x3d, 0x4d, 0x38, 0xba, 0x66, 0x90, 0x15, 0xc8, 0x25, 0x33, 0x50, 0xee, - 0x60, 0x57, 0x81, 0x55, 0x03, 0xd7, 0xae, 0x56, 0x5c, 0x4d, 0x38, 0x2d, 0x28, 0xea, 0x2a, 0x34, - 0x83, 0xb7, 0xa1, 0xdc, 0xf2, 0x03, 0x86, 0x73, 0x80, 0xde, 0x73, 0x42, 0x2b, 0xf7, 0xf6, 0xc2, - 0x0b, 0x63, 0x56, 0x2d, 0x9d, 0xad, 0x54, 0xbb, 0x57, 0x7e, 0xe0, 0x64, 0x60, 0xfc, 0xc0, 0x79, - 0xe0, 0x01, 0x14, 0x5b, 0x3c, 0x1a, 0x78, 0xd2, 0x28, 0x33, 0x94, 0xe3, 0xc0, 0xca, 0x41, 0x28, - 0x86, 0xac, 0x23, 0xb3, 0xc7, 0xc6, 0x23, 0xf8, 0x24, 0xc1, 0x98, 0x81, 0x31, 0x35, 0xf7, 0x58, - 0x77, 0x9f, 0x7b, 0xfe, 0x61, 0x41, 0x25, 0xa9, 0x6c, 0xa4, 0x09, 0x45, 0x3c, 0x8d, 0x78, 0xfa, - 0x7c, 0x75, 0x43, 0x29, 0x6c, 0x7c, 0x44, 0xb4, 0xe9, 0x30, 0x5a, 0xd4, 0xfe, 0x1e, 0xaa, 0x29, - 0xf6, 0x9c, 0x04, 0xd8, 0x4c, 0x27, 0x40, 0x66, 0x6b, 0xd0, 0x46, 0xd2, 0xe9, 0xb1, 0x0b, 0x45, - 0xcd, 0x9c, 0x1b, 0x56, 0x02, 0x85, 0x7d, 0x2f, 0xd2, 0xa9, 0x91, 0x77, 0x71, 0xad, 0x78, 0x6d, - 0x7e, 0x26, 0xf1, 0x78, 0xf2, 0x2e, 0xae, 0x9d, 0x7f, 0x59, 0x50, 0x33, 0xa3, 0xa4, 0x89, 0x20, - 0x83, 0x55, 0x7d, 0x43, 0x59, 0x14, 0xf3, 0x8c, 0xff, 0x6f, 0x16, 0x84, 0x32, 0x86, 0x36, 0xae, - 0xcb, 0xea, 0x68, 0xcc, 0xa8, 0xb4, 0x9b, 0x70, 0x7f, 0x2e, 0xf4, 0x4e, 0x57, 0xe4, 0x25, 0xdc, - 0x9b, 0x0c, 0xc9, 0xd9, 0x79, 0xb2, 0x06, 0x24, 0x0d, 0x33, 0x43, 0xf4, 0x53, 0xa8, 0xaa, 0x47, - 0x47, 0xb6, 0x98, 0x03, 0xcb, 0x1a, 0x60, 0x22, 0x43, 0xa0, 0xd0, 0x67, 0x63, 0x9d, 0x0d, 0x15, - 0x17, 0xd7, 0xce, 0xdf, 0x2c, 0xf5, 0x76, 0x18, 0x8e, 0xe4, 0x7b, 0x26, 0x84, 0xd7, 0x53, 0x09, - 0x58, 0x38, 0x08, 0x7d, 0x69, 0xb2, 0xef, 0xb3, 0xac, 0x37, 0xc4, 0x70, 0x24, 0x15, 0xcc, 0x48, - 0xed, 0xff, 0xc8, 0x45, 0x29, 0xb2, 0x05, 0x85, 0x5d, 0x4f, 0x7a, 0x26, 0x17, 0x32, 0x26, 0x26, - 0x85, 0x48, 0x09, 0x2a, 0x72, 0xa7, 0xa4, 0x1e, 0x4a, 0xc3, 0x91, 0x74, 0x5e, 0xc0, 0xea, 0x75, - 0xed, 0x73, 0x5c, 0xfb, 0x12, 0xaa, 0x29, 0x2d, 0x78, 0x6f, 0x8f, 0x5a, 0x08, 0x28, 0xbb, 0x6a, - 0xa9, 0x7c, 0x4d, 0x36, 0xb2, 0xac, 0x6d, 0x38, 0x9f, 0x40, 0x0d, 0x55, 0x27, 0x11, 0xfc, 0x53, - 0x0e, 0x4a, 0xb1, 0x8a, 0xad, 0x29, 0xbf, 0x9f, 0x65, 0xf9, 0x3d, 0xeb, 0xf2, 0x6b, 0x28, 0xa8, - 0xfa, 0x61, 0x5c, 0xce, 0x18, 0x37, 0x5a, 0xdd, 0x94, 0x98, 0x82, 0x93, 0x6f, 0xa1, 0xe8, 0x32, - 0xa1, 0x46, 0x23, 0xfd, 0x88, 0x78, 0x3e, 0x5f, 0x50, 0x63, 0x26, 0xc2, 0x46, 0x48, 0x89, 0xb7, - 0xfd, 0x5e, 0xe8, 0x05, 0xb4, 0xb0, 0x48, 0x5c, 0x63, 0x52, 0xe2, 0x9a, 0x31, 0x09, 0xf7, 0x5f, - 0x2c, 0xa8, 0x2e, 0x0c, 0xf5, 0xe2, 0x67, 0xde, 0xcc, 0xd3, 0x33, 0xff, 0x3f, 0x3e, 0x3d, 0xff, - 0x9c, 0x9b, 0x56, 0x84, 0x53, 0x92, 0xba, 0x4f, 0x43, 0xee, 0x87, 0xd2, 0xa4, 0x6c, 0x8a, 0xa3, - 0x36, 0xda, 0x1c, 0x74, 0x4d, 0xd1, 0x57, 0x4b, 0x75, 0xcd, 0x0e, 0xb9, 0xe2, 0x55, 0x31, 0x0d, - 0x34, 0x31, 0x29, 0xe9, 0x79, 0x53, 0xd2, 0x55, 0x6a, 0x7c, 0x10, 0x2c, 0xc2, 0xc0, 0x55, 0x5c, - 0x5c, 0xab, 0x2a, 0x7e, 0xc8, 0x91, 0xbb, 0x84, 0xc2, 0x86, 0x42, 0x2b, 0x97, 0x5d, 0x5a, 0xd4, - 0xe1, 0x68, 0x5e, 0xc6, 0x56, 0x2e, 0xbb, 0xb4, 0x94, 0x58, 0xb9, 0x44, 0x2b, 0x27, 0x72, 0x4c, - 0xcb, 0x3a, 0x01, 0x4f, 0xe4, 0x58, 0xb5, 0x19, 0x97, 0x07, 0xc1, 0xa9, 0xd7, 0xe9, 0xd3, 0x8a, - 0xee, 0x6f, 0x31, 0xad, 0xe6, 0x49, 0x15, 0x73, 0xdf, 0x0b, 0xf0, 0xe5, 0x51, 0x76, 0x63, 0xd2, - 0xd9, 0x86, 0x4a, 0x92, 0x2a, 0xaa, 0x73, 0xb5, 0xba, 0x78, 0x14, 0x35, 0x37, 0xd7, 0xea, 0xc6, - 0x59, 0x9e, 0x9b, 0xcd, 0xf2, 0x7c, 0x2a, 0xcb, 0xb7, 0xa0, 0x36, 0x95, 0x34, 0x0a, 0xe4, 0xf2, - 0x4b, 0x61, 0x14, 0xe1, 0x5a, 0xf1, 0x9a, 0x3c, 0xd0, 0x6f, 0xeb, 0x9a, 0x8b, 0x6b, 0xe7, 0x39, - 0xd4, 0xa6, 0xd2, 0x65, 0x5e, 0x5d, 0x76, 0x9e, 0x41, 0xad, 0x2d, 0x3d, 0x39, 0x5a, 0xf0, 0x67, - 0xc8, 0x7f, 0x2c, 0x58, 0x89, 0x31, 0xa6, 0xf2, 0xfc, 0x02, 0xca, 0x17, 0x2c, 0x92, 0xec, 0x2a, - 0xe9, 0x45, 0x74, 0x76, 0x9c, 0xfd, 0x88, 0x08, 0x37, 0x41, 0x92, 0xaf, 0xa1, 0x2c, 0x50, 0x0f, - 0x8b, 0xe7, 0x98, 0x27, 0x59, 0x52, 0xc6, 0x5e, 0x82, 0x27, 0x1b, 0x50, 0x08, 0x78, 0x4f, 0xe0, - 0xb9, 0x57, 0x37, 0x1f, 0x65, 0xc9, 0xbd, 0xe3, 0x3d, 0x17, 0x81, 0xe4, 0x2d, 0x94, 0x2f, 0xbd, - 0x28, 0xf4, 0xc3, 0x5e, 0xfc, 0x26, 0x7f, 0x9a, 0x25, 0xf4, 0xbd, 0xc6, 0xb9, 0x89, 0x80, 0x53, - 0x53, 0x97, 0xe8, 0x8c, 0x9b, 0x98, 0x38, 0xbf, 0x51, 0xb9, 0xac, 0x48, 0xe3, 0xfe, 0x01, 0xd4, - 0xf4, 0x7d, 0xf8, 0xc8, 0x22, 0xa1, 0xa6, 0x42, 0x6b, 0xd1, 0x9d, 0xdd, 0x49, 0x43, 0xdd, 0x69, - 0x49, 0xe7, 0x07, 0xd3, 0xee, 0x62, 0x86, 0xca, 0xa5, 0xa1, 0xd7, 0xe9, 0x7b, 0xbd, 0xf8, 0x9c, - 0x62, 0x52, 0x7d, 0xb9, 0x30, 0xf6, 0xf4, 0xb5, 0x8d, 0x49, 0x95, 0x9b, 0x11, 0xbb, 0xf0, 0xc5, - 0x64, 0x40, 0x4d, 0xe8, 0xcd, 0xbf, 0x96, 0x00, 0x9a, 0xc9, 0x7e, 0xc8, 0x31, 0x2c, 0xa1, 0x3d, - 0xe2, 0x2c, 0x6c, 0x9e, 0xe8, 0xb7, 0xfd, 0xfc, 0x16, 0x0d, 0x96, 0x7c, 0x54, 0xc9, 0x8f, 0x43, - 0x0f, 0x79, 0x91, 0x55, 0x26, 0xd2, 0x73, 0x93, 0xfd, 0xf2, 0x06, 0x94, 0xd1, 0xfb, 0x01, 0x8a, - 0x3a, 0x0b, 0x48, 0x56, 0x2d, 0x4c, 0xe7, 0xad, 0xfd, 0x62, 0x31, 0x48, 0x2b, 0xfd, 0xdc, 0x22, - 0xae, 0xa9, 0x94, 0xc4, 0x59, 0xd0, 0x0a, 0xcd, 0x8d, 0xc9, 0x0a, 0xc0, 0x54, 0xd7, 0xa9, 0x5b, - 0xe4, 0x3b, 0x28, 0xea, 0x5a, 0x47, 0x3e, 0x9d, 0x2f, 0x10, 0xeb, 0x5b, 0xfc, 0xb9, 0x6e, 0x7d, - 0x6e, 0x91, 0xf7, 0x50, 0x50, 0x4d, 0x9e, 0x64, 0x74, 0xac, 0xd4, 0x84, 0x60, 0x3b, 0x8b, 0x20, - 0x26, 0x8a, 0x3f, 0x00, 0x4c, 0x46, 0x0d, 0x92, 0xf1, 0xcf, 0xca, 0xcc, 0xcc, 0x62, 0xd7, 0x6f, - 0x06, 0x1a, 0x03, 0xef, 0x55, 0x9f, 0x3d, 0xe3, 0x24, 0xb3, 0xc3, 0x26, 0xd7, 0xc8, 0x76, 0x16, - 0x41, 0x8c, 0xba, 0x73, 0xa8, 0x4d, 0xfd, 0xf3, 0x4a, 0x7e, 0x96, 0xed, 0xe4, 0xf5, 0x3f, 0x72, - 0xed, 0x57, 0xb7, 0xc2, 0x1a, 0x4b, 0x32, 0x3d, 0xab, 0x99, 0xcf, 0xa4, 0x71, 0x93, 0xdf, 0xd3, - 0xff, 0xa2, 0xda, 0x1b, 0xb7, 0xc6, 0x6b, 0xab, 0x3b, 0x85, 0xdf, 0xe6, 0x86, 0xa7, 0xa7, 0x45, - 0xfc, 0x43, 0xfa, 0xcb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x77, 0x0e, 0x2f, 0x2e, 0x17, - 0x00, 0x00, + 0x11, 0x67, 0x25, 0x59, 0x7f, 0x5a, 0x96, 0x93, 0x0c, 0x4e, 0x98, 0x6c, 0x72, 0x89, 0xb3, 0x49, + 0x0e, 0x15, 0xa1, 0xa4, 0x3b, 0x1f, 0xc1, 0x97, 0xe4, 0xae, 0x0a, 0x5b, 0xb6, 0xb0, 0xaf, 0x12, + 0xdb, 0x35, 0x72, 0x72, 0x05, 0x54, 0x71, 0xb5, 0x96, 0xc6, 0xf2, 0x96, 0x56, 0x3b, 0xcb, 0xce, + 0xc8, 0xb2, 0x78, 0xe2, 0x01, 0xde, 0x28, 0x5e, 0xf9, 0x0c, 0x14, 0x1f, 0x81, 0x27, 0xbe, 0x11, + 0x1f, 0x81, 0x9a, 0x3f, 0xbb, 0x5a, 0x59, 0x5a, 0xd9, 0x86, 0x27, 0x4d, 0xf7, 0xfe, 0xba, 0x7b, + 0xba, 0xa7, 0xa7, 0xbb, 0x47, 0x70, 0xb7, 0xcb, 0x02, 0x11, 0x31, 0xdf, 0xa7, 0x51, 0x23, 0x8c, + 0x98, 0x60, 0x68, 0xfd, 0x74, 0xe4, 0xf9, 0xbd, 0xcb, 0x46, 0xea, 0xc3, 0xc5, 0x97, 0xf6, 0xbb, + 0xbe, 0x27, 0xce, 0x47, 0xa7, 0x8d, 0x2e, 0x1b, 0x36, 0x87, 0xec, 0x74, 0xd2, 0x54, 0xa8, 0x81, + 0x27, 0x9a, 0x6e, 0xe8, 0x35, 0x39, 0x8d, 0x2e, 0xbc, 0x2e, 0xe5, 0x4d, 0x23, 0x14, 0xff, 0x6a, + 0x95, 0xf6, 0xeb, 0x4c, 0x61, 0xce, 0x46, 0x51, 0x97, 0x86, 0xcc, 0xf7, 0xba, 0x93, 0x66, 0x78, + 0xda, 0xd4, 0x2b, 0x2d, 0xe6, 0xd4, 0x61, 0xfd, 0xbd, 0xc7, 0xc5, 0x71, 0xc4, 0xba, 0x94, 0x73, + 0xca, 0x09, 0xfd, 0xc3, 0x88, 0x72, 0x81, 0xee, 0x42, 0x9e, 0xd0, 0x33, 0x6c, 0x6d, 0x58, 0xf5, + 0x0a, 0x91, 0x4b, 0xe7, 0x18, 0xee, 0x5f, 0x41, 0xf2, 0x90, 0x05, 0x9c, 0xa2, 0x2d, 0x58, 0x39, + 0x08, 0xce, 0x18, 0xc7, 0xd6, 0x46, 0xbe, 0x5e, 0xdd, 0x7c, 0xd6, 0x58, 0xe4, 0x5c, 0xc3, 0xc8, + 0x49, 0x24, 0xd1, 0x78, 0x87, 0x43, 0x35, 0xc5, 0x45, 0x8f, 0xa1, 0x12, 0x93, 0xbb, 0xc6, 0xf0, + 0x94, 0x81, 0xda, 0xb0, 0x7a, 0x10, 0x5c, 0xb0, 0x01, 0x6d, 0xb1, 0xe0, 0xcc, 0xeb, 0xe3, 0xdc, + 0x86, 0x55, 0xaf, 0x6e, 0x3a, 0x8b, 0x8d, 0xa5, 0x91, 0x64, 0x46, 0xce, 0xf9, 0x0e, 0xf0, 0xae, + 0xc7, 0xbb, 0x2c, 0x08, 0x68, 0x37, 0x76, 0x26, 0xd3, 0xe9, 0xd9, 0x3d, 0xe5, 0xae, 0xec, 0xc9, + 0x79, 0x04, 0x0f, 0x17, 0xe8, 0xd2, 0x61, 0x71, 0x7e, 0x0f, 0xab, 0x3b, 0x72, 0x6f, 0xd9, 0xca, + 0xbf, 0x81, 0xd2, 0x51, 0x28, 0x3c, 0x16, 0xf0, 0xe5, 0xde, 0x28, 0x35, 0x06, 0x49, 0x62, 0x11, + 0xe7, 0xef, 0x35, 0x63, 0xc0, 0x30, 0xd0, 0x06, 0x54, 0x5b, 0x2c, 0x10, 0xf4, 0x52, 0x1c, 0xbb, + 0xe2, 0xdc, 0x18, 0x4a, 0xb3, 0xd0, 0xe7, 0xb0, 0xb6, 0xcb, 0xba, 0x03, 0x1a, 0x9d, 0x79, 0x3e, + 0x3d, 0x74, 0x87, 0xd4, 0xb8, 0x74, 0x85, 0x8b, 0xbe, 0x95, 0x5e, 0x7b, 0x81, 0x68, 0x8f, 0x82, + 0x2e, 0xce, 0xab, 0xad, 0x3d, 0xcd, 0x3a, 0x55, 0x03, 0x23, 0x53, 0x09, 0xf4, 0x3b, 0xa8, 0x49, + 0x35, 0x3d, 0x63, 0x9a, 0xe3, 0x82, 0x4a, 0x8c, 0xd7, 0xd7, 0x7b, 0xd7, 0x98, 0x91, 0xdb, 0x0b, + 0x44, 0x34, 0x21, 0xb3, 0xba, 0xd0, 0x3a, 0xac, 0x6c, 0xfb, 0x3e, 0x1b, 0xe3, 0x95, 0x8d, 0x7c, + 0xbd, 0x42, 0x34, 0x81, 0x7e, 0x09, 0xa5, 0x6d, 0x21, 0x28, 0x17, 0x1c, 0x17, 0x95, 0xb1, 0xc7, + 0x8b, 0x8d, 0x69, 0x10, 0x89, 0xc1, 0xe8, 0x08, 0x2a, 0xca, 0xfe, 0x76, 0xd4, 0xe7, 0xb8, 0xa4, + 0x24, 0xbf, 0xbc, 0xc1, 0x36, 0x13, 0x19, 0xbd, 0xc5, 0xa9, 0x0e, 0xb4, 0x07, 0x95, 0x96, 0xdb, + 0x3d, 0xa7, 0xed, 0x88, 0x0d, 0x71, 0x59, 0x29, 0xfc, 0xe9, 0x62, 0x85, 0x0a, 0x66, 0x14, 0x1a, + 0x35, 0x89, 0x24, 0xda, 0x86, 0x92, 0x22, 0x4e, 0x18, 0xae, 0xdc, 0x4e, 0x49, 0x2c, 0x87, 0x1c, + 0x58, 0x6d, 0xf5, 0x23, 0x36, 0x0a, 0x8f, 0xdd, 0x88, 0x06, 0x02, 0x83, 0x3a, 0xea, 0x19, 0x1e, + 0x7a, 0x07, 0xa5, 0xbd, 0xcb, 0x90, 0x45, 0x82, 0xe3, 0xea, 0xb2, 0xcb, 0xab, 0x41, 0xc6, 0x80, + 0x91, 0x40, 0x4f, 0x00, 0xf6, 0x2e, 0x45, 0xe4, 0xee, 0x33, 0x19, 0xf6, 0x55, 0x75, 0x1c, 0x29, + 0x0e, 0x6a, 0x43, 0xf1, 0xbd, 0x7b, 0x4a, 0x7d, 0x8e, 0x6b, 0x4a, 0x77, 0xe3, 0x06, 0x81, 0xd5, + 0x02, 0xda, 0x90, 0x91, 0x96, 0x79, 0x7d, 0x48, 0xc5, 0x98, 0x45, 0x83, 0x0f, 0xac, 0x47, 0xf1, + 0x9a, 0xce, 0xeb, 0x14, 0x0b, 0xbd, 0x80, 0xda, 0x21, 0xd3, 0xc1, 0xf3, 0x7c, 0x41, 0x23, 0x7c, + 0x47, 0x6d, 0x66, 0x96, 0xa9, 0xee, 0xb2, 0xef, 0x8a, 0x33, 0x16, 0x0d, 0x39, 0xbe, 0xab, 0x10, + 0x53, 0x86, 0xcc, 0xa0, 0x0e, 0xed, 0x46, 0x54, 0x70, 0x7c, 0x6f, 0x59, 0x06, 0x69, 0x10, 0x89, + 0xc1, 0x08, 0x43, 0xa9, 0x73, 0x3e, 0xec, 0x78, 0x7f, 0xa4, 0x18, 0x6d, 0x58, 0xf5, 0x3c, 0x89, + 0x49, 0xf4, 0x0a, 0xf2, 0x9d, 0xce, 0x3e, 0xfe, 0xb1, 0xd2, 0xf6, 0x30, 0x43, 0x5b, 0x67, 0x9f, + 0x48, 0x14, 0x42, 0x50, 0x38, 0x71, 0xfb, 0x1c, 0xaf, 0xab, 0x7d, 0xa9, 0x35, 0x7a, 0x00, 0xc5, + 0x13, 0x37, 0xea, 0x53, 0x81, 0xef, 0x2b, 0x9f, 0x0d, 0x85, 0xde, 0x40, 0xe9, 0xa3, 0xef, 0x0d, + 0x3d, 0xc1, 0xf1, 0x83, 0x65, 0x97, 0x53, 0x83, 0x8e, 0x42, 0x41, 0x62, 0xbc, 0xdc, 0xad, 0x8a, + 0x37, 0x8d, 0xf0, 0x4f, 0x94, 0xce, 0x98, 0x94, 0x5f, 0x4c, 0xb8, 0x30, 0xde, 0xb0, 0xea, 0x65, + 0x12, 0x93, 0x72, 0x6b, 0xc7, 0x23, 0xdf, 0xc7, 0x0f, 0x15, 0x5b, 0xad, 0xf5, 0xd9, 0xcb, 0x34, + 0x38, 0x1e, 0xf1, 0x73, 0x6c, 0xab, 0x2f, 0x29, 0xce, 0xf4, 0xfb, 0x7b, 0xe6, 0xf6, 0xf0, 0xa3, + 0xf4, 0x77, 0xc9, 0x41, 0x07, 0xb0, 0xda, 0x51, 0x6d, 0xe9, 0x58, 0x35, 0x23, 0xfc, 0x58, 0xf9, + 0xf1, 0xb2, 0x21, 0x3b, 0x57, 0x23, 0xee, 0x5c, 0xd2, 0x87, 0x74, 0xf3, 0x6a, 0x68, 0x30, 0x99, + 0x11, 0x8d, 0xeb, 0xea, 0x67, 0xd3, 0xba, 0x6a, 0x43, 0xf9, 0xd7, 0x32, 0xc9, 0x25, 0xfb, 0x89, + 0x62, 0x27, 0xb4, 0x4c, 0xa6, 0xed, 0x20, 0x60, 0xc2, 0xd5, 0x75, 0xf7, 0xa9, 0x0a, 0x77, 0x9a, + 0x85, 0x0e, 0xa0, 0x44, 0xdc, 0xf1, 0x51, 0x28, 0x38, 0xde, 0x50, 0x47, 0xd7, 0xbc, 0x41, 0xde, + 0x1a, 0x09, 0x73, 0x43, 0x0c, 0x65, 0xff, 0x0a, 0xd0, 0x7c, 0x41, 0x93, 0x1b, 0x1e, 0xd0, 0x49, + 0xdc, 0x08, 0x06, 0x74, 0x22, 0x6b, 0xda, 0x85, 0xeb, 0x8f, 0xe2, 0x72, 0xac, 0x89, 0xb7, 0xb9, + 0xaf, 0x2d, 0xfb, 0x1b, 0x58, 0x9b, 0xad, 0x35, 0xb7, 0x92, 0x7e, 0x03, 0xd5, 0xd4, 0x85, 0xba, + 0x95, 0xe8, 0x5b, 0x58, 0x4d, 0xfb, 0x74, 0x1b, 0x59, 0xe7, 0xdf, 0x16, 0x54, 0x53, 0x15, 0x43, + 0xe5, 0xf6, 0x24, 0xa4, 0x46, 0x58, 0xad, 0xd1, 0x0e, 0xac, 0x6c, 0x0b, 0x11, 0xc9, 0xce, 0x27, + 0x63, 0xfc, 0xf3, 0x6b, 0xeb, 0x4e, 0x43, 0xc1, 0x75, 0x80, 0xb5, 0xa8, 0x3c, 0xcb, 0x5d, 0xca, + 0x85, 0x17, 0xa8, 0x93, 0x53, 0x8d, 0xaa, 0x42, 0xd2, 0x2c, 0xfb, 0x6b, 0x80, 0xa9, 0xd8, 0xad, + 0x7c, 0xf8, 0xa7, 0x05, 0xf7, 0xe6, 0x8a, 0xeb, 0x42, 0x4f, 0xf6, 0x67, 0x3d, 0xd9, 0xbc, 0x61, + 0xa1, 0x9e, 0xf7, 0xe7, 0xff, 0xd8, 0xed, 0x21, 0x14, 0x75, 0x47, 0x5b, 0xb8, 0x43, 0x1b, 0xca, + 0xbb, 0x1e, 0x77, 0x4f, 0x7d, 0xda, 0x53, 0xa2, 0x65, 0x92, 0xd0, 0xaa, 0x9d, 0xaa, 0xdd, 0xeb, + 0xe8, 0x69, 0xc2, 0xd1, 0xa5, 0x0b, 0xad, 0x41, 0x2e, 0x19, 0xc5, 0x72, 0x07, 0xbb, 0x12, 0x2c, + 0xe7, 0x08, 0xed, 0x6a, 0x85, 0x68, 0xc2, 0x69, 0x43, 0x51, 0x17, 0xc3, 0x39, 0xbc, 0x0d, 0xe5, + 0xb6, 0xe7, 0x53, 0x35, 0x8e, 0xe8, 0x3d, 0x27, 0xb4, 0x74, 0x6f, 0x2f, 0xb8, 0x30, 0x66, 0xe5, + 0xd2, 0xd9, 0x4a, 0x4d, 0x1d, 0xd2, 0x0f, 0x35, 0xa0, 0x18, 0x3f, 0xd4, 0x58, 0xf2, 0x00, 0x8a, + 0x6d, 0x16, 0x0d, 0x5d, 0x61, 0x94, 0x19, 0xca, 0x71, 0x60, 0xed, 0x20, 0xe0, 0x21, 0xed, 0x8a, + 0xec, 0xe9, 0xf5, 0x08, 0xee, 0x24, 0x18, 0x33, 0xb7, 0xa6, 0xc6, 0x2f, 0xeb, 0xf6, 0xe3, 0xd7, + 0x3f, 0x2c, 0xa8, 0x24, 0x05, 0x16, 0xb5, 0xa0, 0xa8, 0x4e, 0x23, 0x1e, 0x82, 0x5f, 0x5d, 0x53, + 0x91, 0x1b, 0x9f, 0x14, 0xda, 0x34, 0x3a, 0x2d, 0x6a, 0x7f, 0x0f, 0xd5, 0x14, 0x7b, 0x41, 0x02, + 0x6c, 0xa6, 0x13, 0x20, 0xb3, 0x43, 0x69, 0x23, 0xe9, 0xf4, 0xd8, 0x85, 0xa2, 0x66, 0x2e, 0x0c, + 0x2b, 0x82, 0xc2, 0xbe, 0x1b, 0xe9, 0xd4, 0xc8, 0x13, 0xb5, 0x96, 0xbc, 0x0e, 0x3b, 0x13, 0xea, + 0x78, 0xf2, 0x44, 0xad, 0x9d, 0x7f, 0x59, 0x50, 0x33, 0x13, 0xad, 0x89, 0x20, 0x85, 0xbb, 0xfa, + 0x86, 0xd2, 0x28, 0xe6, 0x19, 0xff, 0xdf, 0x2c, 0x09, 0x65, 0x0c, 0x6d, 0x5c, 0x95, 0xd5, 0xd1, + 0x98, 0x53, 0x69, 0xb7, 0xe0, 0xfe, 0x42, 0xe8, 0xad, 0xae, 0xc8, 0x4b, 0xb8, 0x37, 0x9d, 0xd5, + 0xb3, 0xf3, 0x64, 0x1d, 0x50, 0x1a, 0x66, 0x66, 0xf9, 0xa7, 0x50, 0x95, 0x6f, 0x9f, 0x6c, 0x31, + 0x07, 0x56, 0x35, 0xc0, 0x44, 0x06, 0x41, 0x61, 0x40, 0x27, 0x3a, 0x1b, 0x2a, 0x44, 0xad, 0x9d, + 0xbf, 0x59, 0xf2, 0x09, 0x13, 0x8e, 0xc4, 0x07, 0xca, 0xb9, 0xdb, 0x97, 0x09, 0x58, 0x38, 0x08, + 0x3c, 0x61, 0xb2, 0xef, 0xf3, 0xac, 0xa7, 0x4c, 0x38, 0x12, 0x12, 0x66, 0xa4, 0xf6, 0x7f, 0x44, + 0x94, 0x14, 0xda, 0x82, 0xc2, 0xae, 0x2b, 0x5c, 0x93, 0x0b, 0x19, 0x83, 0x9b, 0x44, 0xa4, 0x04, + 0x25, 0xb9, 0x53, 0x92, 0xef, 0xb5, 0x70, 0x24, 0x9c, 0x17, 0x70, 0xf7, 0xaa, 0xf6, 0x05, 0xae, + 0x7d, 0x05, 0xd5, 0x94, 0x16, 0x75, 0x6f, 0x8f, 0xda, 0x0a, 0x50, 0x26, 0x72, 0x29, 0x7d, 0x4d, + 0x36, 0xb2, 0xaa, 0x6d, 0x38, 0x77, 0xa0, 0xa6, 0x54, 0x27, 0x11, 0xfc, 0x53, 0x0e, 0x4a, 0xb1, + 0x8a, 0xad, 0x19, 0xbf, 0x9f, 0x65, 0xf9, 0x3d, 0xef, 0xf2, 0x6b, 0x28, 0xc8, 0xfa, 0x61, 0x5c, + 0xce, 0x98, 0x7a, 0xda, 0xbd, 0x94, 0x98, 0x84, 0xa3, 0x6f, 0xa1, 0x48, 0x28, 0x97, 0x13, 0x9a, + 0x7e, 0xcb, 0x3c, 0x5f, 0x2c, 0xa8, 0x31, 0x53, 0x61, 0x23, 0x24, 0xc5, 0x3b, 0x5e, 0x3f, 0x70, + 0x7d, 0x5c, 0x58, 0x26, 0xae, 0x31, 0x29, 0x71, 0xcd, 0x98, 0x86, 0xfb, 0x2f, 0x16, 0x54, 0x97, + 0x86, 0x7a, 0xf9, 0x6b, 0x73, 0xee, 0x05, 0x9c, 0xff, 0x1f, 0x5f, 0xc0, 0x7f, 0xce, 0xcd, 0x2a, + 0x52, 0xc3, 0x9a, 0xbc, 0x4f, 0x21, 0xf3, 0x02, 0x61, 0x52, 0x36, 0xc5, 0x91, 0x1b, 0x6d, 0x0d, + 0x7b, 0xa6, 0xe8, 0xcb, 0xa5, 0xbc, 0x66, 0x87, 0x4c, 0xf2, 0xaa, 0x2a, 0x0d, 0x34, 0x31, 0x2d, + 0xe9, 0x79, 0x53, 0xd2, 0x65, 0x6a, 0x7c, 0xe4, 0x34, 0x52, 0x81, 0xab, 0x10, 0xb5, 0x96, 0x55, + 0xfc, 0x90, 0x29, 0xee, 0x8a, 0x12, 0x36, 0x94, 0xb2, 0x32, 0xee, 0xe1, 0xa2, 0x0e, 0x47, 0x6b, + 0x1c, 0x5b, 0x19, 0xf7, 0x70, 0x29, 0xb1, 0x32, 0x56, 0x56, 0x4e, 0xc4, 0x04, 0x97, 0x75, 0x02, + 0x9e, 0x88, 0x89, 0x6c, 0x33, 0x84, 0xf9, 0xfe, 0xa9, 0xdb, 0x1d, 0xe0, 0x8a, 0xee, 0x6f, 0x31, + 0x2d, 0xc7, 0x5a, 0x19, 0x73, 0xcf, 0xf5, 0xd5, 0x03, 0xa8, 0x4c, 0x62, 0xd2, 0xd9, 0x86, 0x4a, + 0x92, 0x2a, 0xb2, 0x73, 0xb5, 0x7b, 0xea, 0x28, 0x6a, 0x24, 0xd7, 0xee, 0xc5, 0x59, 0x9e, 0x9b, + 0xcf, 0xf2, 0x7c, 0x2a, 0xcb, 0xb7, 0xa0, 0x36, 0x93, 0x34, 0x12, 0x44, 0xd8, 0x98, 0x1b, 0x45, + 0x6a, 0x2d, 0x79, 0x2d, 0xe6, 0xeb, 0x27, 0x7e, 0x8d, 0xa8, 0xb5, 0xf3, 0x1c, 0x6a, 0x33, 0xe9, + 0xb2, 0xa8, 0x2e, 0x3b, 0xcf, 0xa0, 0xd6, 0x11, 0xae, 0x18, 0x2d, 0xf9, 0x4f, 0xe6, 0x3f, 0x16, + 0xac, 0xc5, 0x18, 0x53, 0x79, 0x7e, 0x01, 0xe5, 0x0b, 0x1a, 0x09, 0x7a, 0x99, 0xf4, 0x22, 0x3c, + 0x3f, 0x55, 0x7f, 0x52, 0x08, 0x92, 0x20, 0xd1, 0x5b, 0x28, 0x73, 0xa5, 0x87, 0xc6, 0x73, 0xcc, + 0x93, 0x2c, 0x29, 0x63, 0x2f, 0xc1, 0xa3, 0x26, 0x14, 0x7c, 0xd6, 0xe7, 0xea, 0xdc, 0xab, 0x9b, + 0x8f, 0xb2, 0xe4, 0xde, 0xb3, 0x3e, 0x51, 0x40, 0xf4, 0x0e, 0xca, 0x63, 0x37, 0x0a, 0xbc, 0xa0, + 0x1f, 0xff, 0x35, 0xf0, 0x34, 0x4b, 0xe8, 0x7b, 0x8d, 0x23, 0x89, 0x80, 0x53, 0x93, 0x97, 0xe8, + 0x8c, 0x99, 0x98, 0x38, 0xbf, 0x91, 0xb9, 0x2c, 0x49, 0xe3, 0xfe, 0x01, 0xd4, 0xf4, 0x7d, 0xf8, + 0x44, 0x23, 0x2e, 0xa7, 0x42, 0x6b, 0xd9, 0x9d, 0xdd, 0x49, 0x43, 0xc9, 0xac, 0xa4, 0xf3, 0x83, + 0x69, 0x77, 0x31, 0x43, 0xe6, 0x52, 0xe8, 0x76, 0x07, 0x6e, 0x3f, 0x3e, 0xa7, 0x98, 0x94, 0x5f, + 0x2e, 0x8c, 0x3d, 0x7d, 0x6d, 0x63, 0x52, 0xe6, 0x66, 0x44, 0x2f, 0x3c, 0x3e, 0x1d, 0x50, 0x13, + 0x7a, 0xf3, 0xaf, 0x25, 0x80, 0x56, 0xb2, 0x1f, 0x74, 0x0c, 0x2b, 0xca, 0x1e, 0x72, 0x96, 0x36, + 0x4f, 0xe5, 0xb7, 0xfd, 0xfc, 0x06, 0x0d, 0x16, 0x7d, 0x92, 0xc9, 0xaf, 0x86, 0x1e, 0xf4, 0x22, + 0xab, 0x4c, 0xa4, 0xe7, 0x26, 0xfb, 0xe5, 0x35, 0x28, 0xa3, 0xf7, 0x23, 0x14, 0x75, 0x16, 0xa0, + 0xac, 0x5a, 0x98, 0xce, 0x5b, 0xfb, 0xc5, 0x72, 0x90, 0x56, 0xfa, 0x85, 0x85, 0x88, 0xa9, 0x94, + 0xc8, 0x59, 0xd2, 0x0a, 0xcd, 0x8d, 0xc9, 0x0a, 0xc0, 0x4c, 0xd7, 0xa9, 0x5b, 0xe8, 0x3b, 0x28, + 0xea, 0x5a, 0x87, 0x3e, 0x5b, 0x2c, 0x10, 0xeb, 0x5b, 0xfe, 0xb9, 0x6e, 0x7d, 0x61, 0xa1, 0x0f, + 0x50, 0x90, 0x4d, 0x1e, 0x65, 0x74, 0xac, 0xd4, 0x84, 0x60, 0x3b, 0xcb, 0x20, 0x26, 0x8a, 0x3f, + 0x00, 0x4c, 0x47, 0x0d, 0x94, 0xf1, 0x07, 0xcf, 0xdc, 0xcc, 0x62, 0xd7, 0xaf, 0x07, 0x1a, 0x03, + 0x1f, 0x64, 0x9f, 0x3d, 0x63, 0x28, 0xb3, 0xc3, 0x26, 0xd7, 0xc8, 0x76, 0x96, 0x41, 0x8c, 0xba, + 0x73, 0xa8, 0xcd, 0xfc, 0x01, 0x8c, 0x7e, 0x96, 0xed, 0xe4, 0xd5, 0xff, 0x93, 0xed, 0x57, 0x37, + 0xc2, 0x1a, 0x4b, 0x22, 0x3d, 0xab, 0x99, 0xcf, 0xa8, 0x71, 0x9d, 0xdf, 0xb3, 0x7f, 0xe6, 0xda, + 0xcd, 0x1b, 0xe3, 0xb5, 0xd5, 0x9d, 0xc2, 0x6f, 0x73, 0xe1, 0xe9, 0x69, 0x51, 0xfd, 0x2f, 0xfe, + 0xd5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x03, 0x95, 0xa8, 0xb5, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/controller/pb/controller.proto b/controller/pb/controller.proto index d840231e0264..fb0863bfa891 100644 --- a/controller/pb/controller.proto +++ b/controller/pb/controller.proto @@ -80,6 +80,7 @@ message BuildOptions { string Ref = 29; string GroupRef = 30; repeated string Annotations = 31; + map RawOpts = 32; } message ExportEntry { diff --git a/docs/bake-reference.md b/docs/bake-reference.md index ef3ee44640dc..99248fb87c3f 100644 --- a/docs/bake-reference.md +++ b/docs/bake-reference.md @@ -229,6 +229,7 @@ The following table shows the complete list of attributes that you can assign to | [`name`](#targetname) | String | Override the target name when using a matrix. | | [`no-cache-filter`](#targetno-cache-filter) | List | Disable build cache for specific stages | | [`no-cache`](#targetno-cache) | Boolean | Disable build cache completely | +| [`opts`](#targetopts) | Map | Set BuildKit frontend option directly | | [`output`](#targetoutput) | List | Output destinations | | [`platforms`](#targetplatforms) | List | Target platforms | | [`pull`](#targetpull) | Boolean | Always pull images | @@ -769,6 +770,11 @@ target "default" { } ``` +### `target.opts` + +This is the same as the `--opt` flag for `buildctl build`. +This attribute is experimental. + ### `target.output` Configuration for exporting the build output. diff --git a/docs/reference/buildx_build.md b/docs/reference/buildx_build.md index a2cd99fbfb0e..6d50879a77ed 100644 --- a/docs/reference/buildx_build.md +++ b/docs/reference/buildx_build.md @@ -34,6 +34,7 @@ Start a build | `--network` | `string` | `default` | Set the networking mode for the `RUN` instructions during build | | `--no-cache` | | | Do not use cache when building the image | | [`--no-cache-filter`](#no-cache-filter) | `stringArray` | | Do not cache specified stages | +| `--opt` | `stringArray` | | Set BuildKit frontend option directly (EXPERIMENTAL) | | [`-o`](#output), [`--output`](#output) | `stringArray` | | Output destination (format: `type=local,dest=path`) | | [`--platform`](#platform) | `stringArray` | | Set target platform for build | | `--print` | `string` | | Print result of information request (e.g., outline, targets) (EXPERIMENTAL) | diff --git a/docs/reference/buildx_debug_build.md b/docs/reference/buildx_debug_build.md index bec821099e9b..dbc26747cf8f 100644 --- a/docs/reference/buildx_debug_build.md +++ b/docs/reference/buildx_debug_build.md @@ -30,6 +30,7 @@ Start a build | `--network` | `string` | `default` | Set the networking mode for the `RUN` instructions during build | | `--no-cache` | | | Do not use cache when building the image | | `--no-cache-filter` | `stringArray` | | Do not cache specified stages | +| `--opt` | `stringArray` | | Set BuildKit frontend option directly (EXPERIMENTAL) | | `-o`, `--output` | `stringArray` | | Output destination (format: `type=local,dest=path`) | | `--platform` | `stringArray` | | Set target platform for build | | `--print` | `string` | | Print result of information request (e.g., outline, targets) (EXPERIMENTAL) | diff --git a/tests/build.go b/tests/build.go index 88796b15f801..686ee1b8b4f3 100644 --- a/tests/build.go +++ b/tests/build.go @@ -47,6 +47,7 @@ var buildTests = []func(t *testing.T, sb integration.Sandbox){ testBuildCacheExportNotSupported, testBuildOCIExportNotSupported, testBuildMultiPlatformNotSupported, + testBuildOpt, testDockerHostGateway, } @@ -417,6 +418,36 @@ func testBuildMultiPlatformNotSupported(t *testing.T, sb integration.Sandbox) { require.Contains(t, string(out), "Multi-platform build is not supported") } +func testBuildOpt(t *testing.T, sb integration.Sandbox) { + dir := createTestProject(t) + + registry, err := sb.NewRegistry() + if errors.Is(err, integration.ErrRequirements) { + t.Skip(err.Error()) + } + require.NoError(t, err) + target := registry + "/buildx/registry:latest" + + labels := []string{ + "--label", "label0=foo", + "--opt", "label:label0=bar", // higher precedence + } + out, err := buildCmd(sb, withExperimental(), withArgs(labels...), withArgs(fmt.Sprintf("--output=type=image,name=%s,push=true", target), dir)) + require.NoError(t, err, string(out)) + + desc, provider, err := contentutil.ProviderFromRef(target) + require.NoError(t, err) + imgs, err := testutil.ReadImages(sb.Context(), provider, desc) + require.NoError(t, err) + + pk := platforms.Format(platforms.Normalize(platforms.DefaultSpec())) + img := imgs.Find(pk) + require.NotNil(t, img) + + require.NotNil(t, img.Manifest) + assert.Equal(t, "bar", img.Img.Config.Labels["label0"]) +} + func testDockerHostGateway(t *testing.T, sb integration.Sandbox) { dockerfile := []byte(` FROM busybox diff --git a/tests/integration.go b/tests/integration.go index 239e9b4f74e9..76a53218cac4 100644 --- a/tests/integration.go +++ b/tests/integration.go @@ -27,6 +27,10 @@ func withEnv(env ...string) cmdOpt { } } +func withExperimental() cmdOpt { + return withEnv("BUILDX_EXPERIMENTAL=1") +} + func withArgs(args ...string) cmdOpt { return func(cmd *exec.Cmd) { cmd.Args = append(cmd.Args, args...)