diff --git a/client/llb/exec.go b/client/llb/exec.go index 9d27bbcd1c92d..640b74171c626 100644 --- a/client/llb/exec.go +++ b/client/llb/exec.go @@ -174,11 +174,17 @@ func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, [] return "", nil, nil, nil, err } + hostname, err := getHostname(e.base)(ctx) + if err != nil { + return "", nil, nil, nil, err + } + meta := &pb.Meta{ - Args: args, - Env: env.ToArray(), - Cwd: cwd, - User: user, + Args: args, + Env: env.ToArray(), + Cwd: cwd, + User: user, + Hostname: hostname, } extraHosts, err := getExtraHosts(e.base)(ctx) if err != nil { diff --git a/client/llb/meta.go b/client/llb/meta.go index ab0f59328eb74..3bec5f6a0e824 100644 --- a/client/llb/meta.go +++ b/client/llb/meta.go @@ -19,6 +19,7 @@ var ( keyDir = contextKeyT("llb.exec.dir") keyEnv = contextKeyT("llb.exec.env") keyUser = contextKeyT("llb.exec.user") + keyHostname = contextKeyT("llb.exec.hostname") keyExtraHost = contextKeyT("llb.exec.extrahost") keyPlatform = contextKeyT("llb.platform") keyNetwork = contextKeyT("llb.network") @@ -143,6 +144,25 @@ func getUser(s State) func(context.Context) (string, error) { } } +func hostname(str string) StateOption { + return func(s State) State { + return s.WithValue(keyHostname, str) + } +} + +func getHostname(s State) func(context.Context) (string, error) { + return func(ctx context.Context) (string, error) { + v, err := s.getValue(keyHostname)(ctx) + if err != nil { + return "", err + } + if v != nil { + return v.(string), nil + } + return "", nil + } +} + func args(args ...string) StateOption { return func(s State) State { return s.WithValue(keyArgs, args) diff --git a/client/llb/state.go b/client/llb/state.go index dac9b8713e3c1..58dff5e8d8e67 100644 --- a/client/llb/state.go +++ b/client/llb/state.go @@ -320,6 +320,14 @@ func (s State) User(v string) State { return User(v)(s) } +func (s State) Hostname(v string) State { + return hostname(v)(s) +} + +func (s State) GetHostname(ctx context.Context) (string, error) { + return getHostname(s)(ctx) +} + func (s State) Platform(p specs.Platform) State { return platform(p)(s) } diff --git a/executor/containerdexecutor/executor.go b/executor/containerdexecutor/executor.go index 4919054acd276..a383ed0797fa1 100644 --- a/executor/containerdexecutor/executor.go +++ b/executor/containerdexecutor/executor.go @@ -56,7 +56,7 @@ func (w containerdExecutor) Exec(ctx context.Context, meta executor.Meta, root c return err } - hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, nil) + hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, nil, meta.Hostname) if err != nil { return err } diff --git a/executor/executor.go b/executor/executor.go index df6d7920e54ff..bdb5bc6e18e9f 100644 --- a/executor/executor.go +++ b/executor/executor.go @@ -14,6 +14,7 @@ type Meta struct { Env []string User string Cwd string + Hostname string Tty bool ReadonlyRootFS bool ExtraHosts []HostIP diff --git a/executor/oci/hosts.go b/executor/oci/hosts.go index 552b5851e0461..1e3d36f72c399 100644 --- a/executor/oci/hosts.go +++ b/executor/oci/hosts.go @@ -14,15 +14,12 @@ import ( "github.com/pkg/errors" ) -const hostsContent = ` -127.0.0.1 localhost buildkitsandbox -::1 localhost ip6-localhost ip6-loopback -` +const defaultHostname = "buildkitsandbox" -func GetHostsFile(ctx context.Context, stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping) (string, func(), error) { +func GetHostsFile(ctx context.Context, stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping, hostname string) (string, func(), error) { if len(extraHosts) == 0 { _, err := g.Do(ctx, stateDir, func(ctx context.Context) (interface{}, error) { - _, _, err := makeHostsFile(stateDir, nil, idmap) + _, _, err := makeHostsFile(stateDir, nil, idmap, hostname) return nil, err }) if err != nil { @@ -30,12 +27,12 @@ func GetHostsFile(ctx context.Context, stateDir string, extraHosts []executor.Ho } return filepath.Join(stateDir, "hosts"), func() {}, nil } - return makeHostsFile(stateDir, extraHosts, idmap) + return makeHostsFile(stateDir, extraHosts, idmap, hostname) } -func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping) (string, func(), error) { +func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping, hostname string) (string, func(), error) { p := filepath.Join(stateDir, "hosts") - if len(extraHosts) != 0 { + if len(extraHosts) != 0 || hostname != defaultHostname { p += "." + identity.NewID() } _, err := os.Stat(p) @@ -47,8 +44,7 @@ func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools } b := &bytes.Buffer{} - - if _, err := b.Write([]byte(hostsContent)); err != nil { + if _, err := b.Write([]byte(initHostsFile(hostname))); err != nil { return "", nil, err } @@ -77,3 +73,14 @@ func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools os.RemoveAll(p) }, nil } + +func initHostsFile(hostname string) string { + var hosts string + if hostname != "" { + hosts = fmt.Sprintf("127.0.0.1 localhost %s", hostname) + } else { + hosts = fmt.Sprintf("127.0.0.1 localhost %s", defaultHostname) + } + hosts = fmt.Sprintf("%s\n::1 localhost ip6-localhost ip6-loopback\n", hosts) + return hosts +} diff --git a/executor/oci/spec_unix.go b/executor/oci/spec_unix.go index 8ab4fb47077da..ccfff7a09b64e 100644 --- a/executor/oci/spec_unix.go +++ b/executor/oci/spec_unix.go @@ -65,7 +65,11 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou s.Process.Cwd = meta.Cwd s.Process.Rlimits = nil // reset open files limit s.Process.NoNewPrivileges = false // reset nonewprivileges - s.Hostname = "buildkitsandbox" + + s.Hostname = defaultHostname + if meta.Hostname != "" { + s.Hostname = meta.Hostname + } s.Mounts, err = GetMounts(ctx, withProcessMode(processMode), diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go index dc16c8f0a1da2..c713aa31b28f4 100644 --- a/executor/runcexecutor/executor.go +++ b/executor/runcexecutor/executor.go @@ -143,7 +143,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta executor.Meta, root cache. return err } - hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, w.idmap) + hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, w.idmap, meta.Hostname) if err != nil { return err } diff --git a/frontend/dockerfile/builder/build.go b/frontend/dockerfile/builder/build.go index a91b46dd9df1e..43d58739f6b4a 100644 --- a/frontend/dockerfile/builder/build.go +++ b/frontend/dockerfile/builder/build.go @@ -53,6 +53,7 @@ const ( keyNameDockerfile = "dockerfilekey" keyContextSubDir = "contextsubdir" keyContextKeepGitDir = "build-arg:BUILDKIT_CONTEXT_KEEP_GIT_DIR" + keyHostname = "hostname" ) var httpPrefix = regexp.MustCompile(`^https?://`) @@ -375,6 +376,7 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) { OverrideCopyImage: opts[keyOverrideCopyImage], LLBCaps: &caps, SourceMap: sourceMap, + Hostname: opts[keyHostname], }) if err != nil { diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go index 28c7efcaec20c..4e3abc191ed47 100644 --- a/frontend/dockerfile/dockerfile2llb/convert.go +++ b/frontend/dockerfile/dockerfile2llb/convert.go @@ -62,6 +62,7 @@ type ConvertOpt struct { LLBCaps *apicaps.CapSet ContextLocalName string SourceMap *llb.SourceMap + Hostname string } func Dockerfile2LLB(ctx context.Context, dt []byte, opt ConvertOpt) (*llb.State, *Image, error) { @@ -322,6 +323,9 @@ func Dockerfile2LLB(ctx context.Context, dt []byte, opt ConvertOpt) (*llb.State, k, v := parseKeyValue(env) d.state = d.state.AddEnv(k, v) } + if opt.Hostname != "" { + d.state = d.state.Hostname(opt.Hostname) + } if d.image.Config.WorkingDir != "" { if err = dispatchWorkdir(d, &instructions.WorkdirCommand{Path: d.image.Config.WorkingDir}, false, nil); err != nil { return nil, nil, parser.WithLocation(err, d.stage.Location) diff --git a/solver/llbsolver/ops/exec.go b/solver/llbsolver/ops/exec.go index 54f0c3a852359..02d9e46a240f7 100644 --- a/solver/llbsolver/ops/exec.go +++ b/solver/llbsolver/ops/exec.go @@ -727,6 +727,7 @@ func (e *execOp) Exec(ctx context.Context, inputs []solver.Result) ([]solver.Res Env: e.op.Meta.Env, Cwd: e.op.Meta.Cwd, User: e.op.Meta.User, + Hostname: e.op.Meta.Hostname, ReadonlyRootFS: readonlyRootFS, ExtraHosts: extraHosts, NetMode: e.op.Network, diff --git a/solver/pb/ops.pb.go b/solver/pb/ops.pb.go index 90e549d83342d..8f07ca7b33e88 100644 --- a/solver/pb/ops.pb.go +++ b/solver/pb/ops.pb.go @@ -467,6 +467,7 @@ type Meta struct { User string `protobuf:"bytes,4,opt,name=user,proto3" json:"user,omitempty"` ProxyEnv *ProxyEnv `protobuf:"bytes,5,opt,name=proxy_env,json=proxyEnv,proto3" json:"proxy_env,omitempty"` ExtraHosts []*HostIP `protobuf:"bytes,6,rep,name=extraHosts,proto3" json:"extraHosts,omitempty"` + Hostname string `protobuf:"bytes,7,opt,name=hostname,proto3" json:"hostname,omitempty"` } func (m *Meta) Reset() { *m = Meta{} } @@ -540,6 +541,13 @@ func (m *Meta) GetExtraHosts() []*HostIP { return nil } +func (m *Meta) GetHostname() string { + if m != nil { + return m.Hostname + } + return "" +} + // Mount specifies how to mount an input Op as a filesystem. type Mount struct { Input InputIndex `protobuf:"varint,1,opt,name=input,proto3,customtype=InputIndex" json:"input"` @@ -2316,144 +2324,145 @@ func init() { func init() { proto.RegisterFile("ops.proto", fileDescriptor_8de16154b2733812) } var fileDescriptor_8de16154b2733812 = []byte{ - // 2189 bytes of a gzipped FileDescriptorProto + // 2205 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, 0xf1, 0x17, 0xdf, 0x64, 0x51, 0x92, 0xf9, 0xef, 0xf5, 0xee, 0x9f, 0xab, 0x38, 0x92, 0x76, 0xec, 0x2c, 0x64, 0xd9, 0xa6, 0x00, 0x2d, 0xb0, 0x5e, 0x2c, 0x82, 0x20, 0xe2, 0xc3, 0x10, 0xd7, 0xb6, 0x28, 0x34, 0xfd, 0xc8, 0xcd, 0x18, 0x0d, 0x9b, 0xd4, 0x40, 0xe4, 0xf4, 0xa0, 0xa7, 0x69, 0x8b, - 0x97, 0x1c, 0xfc, 0x09, 0x16, 0x08, 0x90, 0x5b, 0x02, 0xe4, 0x12, 0x20, 0xf7, 0x5c, 0x73, 0xdf, - 0xe3, 0x22, 0xc8, 0x61, 0x91, 0xc3, 0x26, 0xb0, 0x3f, 0x47, 0x80, 0xa0, 0xaa, 0x7b, 0x1e, 0x94, - 0x65, 0xd8, 0x46, 0x82, 0x9c, 0xd8, 0xfd, 0xab, 0x5f, 0x57, 0x57, 0x57, 0x55, 0xd7, 0x54, 0x13, - 0x6a, 0x32, 0x8c, 0x5a, 0xa1, 0x92, 0x5a, 0xb2, 0x7c, 0x78, 0xb2, 0x71, 0x67, 0xe2, 0xeb, 0xd3, - 0xf9, 0x49, 0xcb, 0x93, 0xb3, 0xbd, 0x89, 0x9c, 0xc8, 0x3d, 0x12, 0x9d, 0xcc, 0xc7, 0x34, 0xa3, - 0x09, 0x8d, 0xcc, 0x12, 0xe7, 0x0f, 0x79, 0xc8, 0x0f, 0x42, 0xf6, 0x19, 0x94, 0xfd, 0x20, 0x9c, - 0xeb, 0xa8, 0x99, 0xdb, 0x2e, 0xec, 0xd4, 0xf7, 0x6b, 0xad, 0xf0, 0xa4, 0xd5, 0x47, 0x84, 0x5b, - 0x01, 0xdb, 0x86, 0xa2, 0x38, 0x17, 0x5e, 0x33, 0xbf, 0x9d, 0xdb, 0xa9, 0xef, 0x03, 0x12, 0x7a, - 0xe7, 0xc2, 0x1b, 0x84, 0x87, 0x2b, 0x9c, 0x24, 0xec, 0x73, 0x28, 0x47, 0x72, 0xae, 0x3c, 0xd1, - 0x2c, 0x10, 0x67, 0x15, 0x39, 0x43, 0x42, 0x88, 0x65, 0xa5, 0xa8, 0x69, 0xec, 0x4f, 0x45, 0xb3, - 0x98, 0x6a, 0xba, 0xe7, 0x4f, 0x0d, 0x87, 0x24, 0xec, 0x3a, 0x94, 0x4e, 0xe6, 0xfe, 0x74, 0xd4, - 0x2c, 0x11, 0xa5, 0x8e, 0x94, 0x36, 0x02, 0xc4, 0x31, 0x32, 0xb6, 0x03, 0xd5, 0x70, 0xea, 0xea, - 0xb1, 0x54, 0xb3, 0x26, 0xa4, 0x1b, 0x1e, 0x5b, 0x8c, 0x27, 0x52, 0x76, 0x17, 0xea, 0x9e, 0x0c, - 0x22, 0xad, 0x5c, 0x3f, 0xd0, 0x51, 0xb3, 0x4e, 0xe4, 0x8f, 0x91, 0xfc, 0x54, 0xaa, 0x33, 0xa1, - 0x3a, 0xa9, 0x90, 0x67, 0x99, 0xed, 0x22, 0xe4, 0x65, 0xe8, 0xfc, 0x36, 0x07, 0xd5, 0x58, 0x2b, + 0x97, 0x1c, 0xfc, 0x09, 0x16, 0x08, 0x90, 0x5b, 0x02, 0xe4, 0x92, 0x4f, 0x90, 0x6b, 0x8e, 0x01, + 0xf6, 0xb8, 0x08, 0x72, 0x58, 0xe4, 0xb0, 0x09, 0xec, 0xcf, 0x11, 0x20, 0xa8, 0xea, 0x9e, 0x07, + 0x65, 0x19, 0xb6, 0x91, 0x20, 0xa7, 0xe9, 0xae, 0xfa, 0x75, 0x75, 0x75, 0xbd, 0xba, 0x7a, 0xa0, + 0x26, 0xc3, 0xa8, 0x15, 0x2a, 0xa9, 0x25, 0xcb, 0x87, 0x27, 0x1b, 0x77, 0x26, 0xbe, 0x3e, 0x9d, + 0x9f, 0xb4, 0x3c, 0x39, 0xdb, 0x9b, 0xc8, 0x89, 0xdc, 0x23, 0xd6, 0xc9, 0x7c, 0x4c, 0x33, 0x9a, + 0xd0, 0xc8, 0x2c, 0x71, 0xfe, 0x90, 0x87, 0xfc, 0x20, 0x64, 0x9f, 0x41, 0xd9, 0x0f, 0xc2, 0xb9, + 0x8e, 0x9a, 0xb9, 0xed, 0xc2, 0x4e, 0x7d, 0xbf, 0xd6, 0x0a, 0x4f, 0x5a, 0x7d, 0xa4, 0x70, 0xcb, + 0x60, 0xdb, 0x50, 0x14, 0xe7, 0xc2, 0x6b, 0xe6, 0xb7, 0x73, 0x3b, 0xf5, 0x7d, 0x40, 0x40, 0xef, + 0x5c, 0x78, 0x83, 0xf0, 0x70, 0x85, 0x13, 0x87, 0x7d, 0x0e, 0xe5, 0x48, 0xce, 0x95, 0x27, 0x9a, + 0x05, 0xc2, 0xac, 0x22, 0x66, 0x48, 0x14, 0x42, 0x59, 0x2e, 0x4a, 0x1a, 0xfb, 0x53, 0xd1, 0x2c, + 0xa6, 0x92, 0xee, 0xf9, 0x53, 0x83, 0x21, 0x0e, 0xbb, 0x0e, 0xa5, 0x93, 0xb9, 0x3f, 0x1d, 0x35, + 0x4b, 0x04, 0xa9, 0x23, 0xa4, 0x8d, 0x04, 0xc2, 0x18, 0x1e, 0xdb, 0x81, 0x6a, 0x38, 0x75, 0xf5, + 0x58, 0xaa, 0x59, 0x13, 0xd2, 0x0d, 0x8f, 0x2d, 0x8d, 0x27, 0x5c, 0x76, 0x17, 0xea, 0x9e, 0x0c, + 0x22, 0xad, 0x5c, 0x3f, 0xd0, 0x51, 0xb3, 0x4e, 0xe0, 0x8f, 0x11, 0xfc, 0x54, 0xaa, 0x33, 0xa1, + 0x3a, 0x29, 0x93, 0x67, 0x91, 0xed, 0x22, 0xe4, 0x65, 0xe8, 0xfc, 0x36, 0x07, 0xd5, 0x58, 0x2a, 0x73, 0x60, 0xf5, 0x40, 0x79, 0xa7, 0xbe, 0x16, 0x9e, 0x9e, 0x2b, 0xd1, 0xcc, 0x6d, 0xe7, 0x76, - 0x6a, 0x7c, 0x09, 0x63, 0xeb, 0x90, 0x1f, 0x0c, 0xc9, 0x51, 0x35, 0x9e, 0x1f, 0x0c, 0x59, 0x13, - 0x2a, 0x4f, 0x5c, 0xe5, 0xbb, 0x81, 0x26, 0xcf, 0xd4, 0x78, 0x3c, 0x65, 0xd7, 0xa0, 0x36, 0x18, - 0x3e, 0x11, 0x2a, 0xf2, 0x65, 0x40, 0xfe, 0xa8, 0xf1, 0x14, 0x60, 0x9b, 0x00, 0x83, 0xe1, 0x3d, - 0xe1, 0xa2, 0xd2, 0xa8, 0x59, 0xda, 0x2e, 0xec, 0xd4, 0x78, 0x06, 0x71, 0x7e, 0x0d, 0x25, 0x8a, - 0x11, 0xfb, 0x06, 0xca, 0x23, 0x7f, 0x22, 0x22, 0x6d, 0xcc, 0x69, 0xef, 0x7f, 0xf7, 0xe3, 0xd6, - 0xca, 0xdf, 0x7f, 0xdc, 0xda, 0xcd, 0x24, 0x83, 0x0c, 0x45, 0xe0, 0xc9, 0x40, 0xbb, 0x7e, 0x20, - 0x54, 0xb4, 0x37, 0x91, 0x77, 0xcc, 0x92, 0x56, 0x97, 0x7e, 0xb8, 0xd5, 0xc0, 0x6e, 0x42, 0xc9, - 0x0f, 0x46, 0xe2, 0x9c, 0xec, 0x2f, 0xb4, 0x3f, 0xb2, 0xaa, 0xea, 0x83, 0xb9, 0x0e, 0xe7, 0xba, - 0x8f, 0x22, 0x6e, 0x18, 0xce, 0xef, 0x73, 0x50, 0x36, 0x39, 0xc0, 0xae, 0x41, 0x71, 0x26, 0xb4, - 0x4b, 0xfb, 0xd7, 0xf7, 0xab, 0xe8, 0xdb, 0x87, 0x42, 0xbb, 0x9c, 0x50, 0x4c, 0xaf, 0x99, 0x9c, - 0xa3, 0xef, 0xf3, 0x69, 0x7a, 0x3d, 0x44, 0x84, 0x5b, 0x01, 0xfb, 0x19, 0x54, 0x02, 0xa1, 0x5f, - 0x48, 0x75, 0x46, 0x3e, 0x5a, 0x37, 0x41, 0x3f, 0x12, 0xfa, 0xa1, 0x1c, 0x09, 0x1e, 0xcb, 0xd8, - 0x6d, 0xa8, 0x46, 0xc2, 0x9b, 0x2b, 0x5f, 0x2f, 0xc8, 0x5f, 0xeb, 0xfb, 0x0d, 0xca, 0x32, 0x8b, - 0x11, 0x39, 0x61, 0x38, 0x7f, 0xca, 0x41, 0x11, 0xcd, 0x60, 0x0c, 0x8a, 0xae, 0x9a, 0x98, 0xec, - 0xae, 0x71, 0x1a, 0xb3, 0x06, 0x14, 0x44, 0xf0, 0x9c, 0x2c, 0xaa, 0x71, 0x1c, 0x22, 0xe2, 0xbd, - 0x18, 0xd9, 0x18, 0xe1, 0x10, 0xd7, 0xcd, 0x23, 0xa1, 0x6c, 0x68, 0x68, 0xcc, 0x6e, 0x42, 0x2d, - 0x54, 0xf2, 0x7c, 0xf1, 0x0c, 0x57, 0x97, 0x32, 0x89, 0x87, 0x60, 0x2f, 0x78, 0xce, 0xab, 0xa1, - 0x1d, 0xb1, 0x5d, 0x00, 0x71, 0xae, 0x95, 0x7b, 0x28, 0x23, 0x1d, 0x35, 0xcb, 0x74, 0x76, 0xca, - 0x77, 0x04, 0xfa, 0xc7, 0x3c, 0x23, 0x75, 0xfe, 0x9a, 0x87, 0x12, 0xb9, 0x84, 0xed, 0x60, 0x04, - 0xc2, 0xb9, 0x09, 0x66, 0xa1, 0xcd, 0x6c, 0x04, 0x80, 0x62, 0x9d, 0x04, 0x00, 0xe3, 0xbe, 0x81, - 0xde, 0x98, 0x0a, 0x4f, 0x4b, 0x65, 0xd3, 0x2d, 0x99, 0xa3, 0xe9, 0x23, 0xcc, 0x08, 0x73, 0x1a, - 0x1a, 0xb3, 0x5b, 0x50, 0x96, 0x14, 0x46, 0x3a, 0xd0, 0x5b, 0x82, 0x6b, 0x29, 0xa8, 0x5c, 0x09, - 0x77, 0x24, 0x83, 0xe9, 0x82, 0x8e, 0x59, 0xe5, 0xc9, 0x9c, 0xdd, 0x82, 0x1a, 0xc5, 0xed, 0xd1, - 0x22, 0x14, 0xcd, 0x32, 0xc5, 0x61, 0x2d, 0x89, 0x29, 0x82, 0x3c, 0x95, 0xe3, 0x45, 0xf5, 0x5c, - 0xef, 0x54, 0x0c, 0x42, 0xdd, 0xbc, 0x9a, 0xfa, 0xab, 0x63, 0x31, 0x9e, 0x48, 0x51, 0x6d, 0x24, - 0x3c, 0x25, 0x34, 0x52, 0x3f, 0x26, 0xea, 0x9a, 0x0d, 0xaf, 0x01, 0x79, 0x2a, 0x67, 0x0e, 0x94, - 0x87, 0xc3, 0x43, 0x64, 0x7e, 0x92, 0x16, 0x12, 0x83, 0x70, 0x2b, 0x71, 0xfa, 0x50, 0x8d, 0xb7, - 0xc1, 0x5b, 0xd9, 0xef, 0xda, 0xfb, 0x9a, 0xef, 0x77, 0xd9, 0x1d, 0xa8, 0x44, 0xa7, 0xae, 0xf2, - 0x83, 0x09, 0xf9, 0x6e, 0x7d, 0xff, 0xa3, 0xc4, 0xaa, 0xa1, 0xc1, 0x51, 0x53, 0xcc, 0x71, 0x24, - 0xd4, 0x12, 0x33, 0xde, 0xd0, 0xd5, 0x80, 0xc2, 0xdc, 0x1f, 0x91, 0x9e, 0x35, 0x8e, 0x43, 0x44, - 0x26, 0xbe, 0xc9, 0xa5, 0x35, 0x8e, 0x43, 0x0c, 0xc8, 0x4c, 0x8e, 0x4c, 0xd9, 0x5b, 0xe3, 0x34, - 0x46, 0x1f, 0xcb, 0x50, 0xfb, 0x32, 0x70, 0xa7, 0xb1, 0x8f, 0xe3, 0xb9, 0x33, 0x8d, 0xcf, 0xf7, - 0x3f, 0xd9, 0xed, 0x37, 0x39, 0xa8, 0xc6, 0xb5, 0x1a, 0x0b, 0x8f, 0x3f, 0x12, 0x81, 0xf6, 0xc7, - 0xbe, 0x50, 0x76, 0xe3, 0x0c, 0xc2, 0xee, 0x40, 0xc9, 0xd5, 0x5a, 0xc5, 0xd7, 0xf9, 0xff, 0xb3, - 0x85, 0xbe, 0x75, 0x80, 0x92, 0x5e, 0xa0, 0xd5, 0x82, 0x1b, 0xd6, 0xc6, 0x57, 0x00, 0x29, 0x88, - 0xb6, 0x9e, 0x89, 0x85, 0xd5, 0x8a, 0x43, 0x76, 0x15, 0x4a, 0xcf, 0xdd, 0xe9, 0x5c, 0xd8, 0x1c, - 0x36, 0x93, 0xaf, 0xf3, 0x5f, 0xe5, 0x9c, 0xbf, 0xe4, 0xa1, 0x62, 0x0b, 0x3f, 0xbb, 0x0d, 0x15, - 0x2a, 0xfc, 0xd6, 0xa2, 0xcb, 0x2f, 0x46, 0x4c, 0x61, 0x7b, 0xc9, 0x17, 0x2d, 0x63, 0xa3, 0x55, - 0x65, 0xbe, 0x6c, 0xd6, 0xc6, 0xf4, 0xfb, 0x56, 0x18, 0x89, 0xb1, 0xfd, 0x74, 0xad, 0x23, 0xbb, - 0x2b, 0xc6, 0x7e, 0xe0, 0xa3, 0x7f, 0x38, 0x8a, 0xd8, 0xed, 0xf8, 0xd4, 0x45, 0xd2, 0xf8, 0x49, - 0x56, 0xe3, 0x9b, 0x87, 0xee, 0x43, 0x3d, 0xb3, 0xcd, 0x25, 0xa7, 0xbe, 0x91, 0x3d, 0xb5, 0xdd, - 0x92, 0xd4, 0x99, 0xef, 0x6e, 0xea, 0x85, 0xff, 0xc0, 0x7f, 0x5f, 0x02, 0xa4, 0x2a, 0xdf, 0xbf, - 0xb0, 0x38, 0x2f, 0x0b, 0x00, 0x83, 0x10, 0x4b, 0xe7, 0xc8, 0xa5, 0xfa, 0xbd, 0xea, 0x4f, 0x02, - 0xa9, 0xc4, 0x33, 0xba, 0xaa, 0xb4, 0xbe, 0xca, 0xeb, 0x06, 0xa3, 0x1b, 0xc3, 0x0e, 0xa0, 0x3e, - 0x12, 0x91, 0xa7, 0x7c, 0x4a, 0x28, 0xeb, 0xf4, 0x2d, 0x3c, 0x53, 0xaa, 0xa7, 0xd5, 0x4d, 0x19, - 0xc6, 0x57, 0xd9, 0x35, 0x6c, 0x1f, 0x56, 0xc5, 0x79, 0x28, 0x95, 0xb6, 0xbb, 0x98, 0xfe, 0xe0, - 0x8a, 0xe9, 0x34, 0x10, 0xa7, 0x9d, 0x78, 0x5d, 0xa4, 0x13, 0xe6, 0x42, 0xd1, 0x73, 0x43, 0xf3, - 0x71, 0xac, 0xef, 0x37, 0x2f, 0xec, 0xd7, 0x71, 0x43, 0xe3, 0xb4, 0xf6, 0x17, 0x78, 0xd6, 0x97, - 0xff, 0xd8, 0xba, 0x95, 0xf9, 0x22, 0xce, 0xe4, 0xc9, 0x62, 0x8f, 0xf2, 0xe5, 0xcc, 0xd7, 0x7b, - 0x73, 0xed, 0x4f, 0xf7, 0xdc, 0xd0, 0x47, 0x75, 0xb8, 0xb0, 0xdf, 0xe5, 0xa4, 0x7a, 0xe3, 0x17, - 0xd0, 0xb8, 0x68, 0xf7, 0x87, 0xc4, 0x60, 0xe3, 0x2e, 0xd4, 0x12, 0x3b, 0xde, 0xb5, 0xb0, 0x9a, - 0x0d, 0xde, 0x9f, 0x73, 0x50, 0x36, 0xb7, 0x8a, 0xdd, 0x85, 0xda, 0x54, 0x7a, 0x2e, 0x1a, 0x10, - 0xb7, 0x68, 0x9f, 0xa6, 0x97, 0xae, 0xf5, 0x20, 0x96, 0x19, 0xaf, 0xa6, 0x5c, 0x4c, 0x32, 0x3f, - 0x18, 0xcb, 0xf8, 0x16, 0xac, 0xa7, 0x8b, 0xfa, 0xc1, 0x58, 0x72, 0x23, 0xdc, 0xb8, 0x0f, 0xeb, - 0xcb, 0x2a, 0x2e, 0xb1, 0xf3, 0xfa, 0x72, 0xba, 0x52, 0x5d, 0x4e, 0x16, 0x65, 0xcd, 0xbe, 0x0b, - 0xb5, 0x04, 0x67, 0xbb, 0x6f, 0x1a, 0xbe, 0x9a, 0x5d, 0x99, 0xb1, 0xd5, 0x99, 0x02, 0xa4, 0xa6, - 0x61, 0xb1, 0xc2, 0x5e, 0x30, 0x70, 0x67, 0x71, 0x93, 0x95, 0xcc, 0xe9, 0xdb, 0xe6, 0x6a, 0x97, - 0x4c, 0x59, 0xe5, 0x34, 0x66, 0x2d, 0x80, 0x51, 0x72, 0x61, 0xdf, 0x72, 0x8d, 0x33, 0x0c, 0x67, - 0x00, 0xd5, 0xd8, 0x08, 0xb6, 0x0d, 0xf5, 0xc8, 0xee, 0x8c, 0x9d, 0x0f, 0x6e, 0x57, 0xe2, 0x59, - 0x08, 0x3b, 0x18, 0xe5, 0x06, 0x13, 0xb1, 0xd4, 0xc1, 0x70, 0x44, 0xb8, 0x15, 0x38, 0x4f, 0xa1, - 0x44, 0x00, 0x5e, 0xb3, 0x48, 0xbb, 0x4a, 0xdb, 0x66, 0xc8, 0x34, 0x07, 0x32, 0xa2, 0x6d, 0xdb, - 0x45, 0x4c, 0x44, 0x6e, 0x08, 0xec, 0x06, 0xb6, 0x20, 0x23, 0xeb, 0xd1, 0xcb, 0x78, 0x28, 0x76, - 0x7e, 0x0e, 0xd5, 0x18, 0xc6, 0x93, 0x3f, 0xf0, 0x03, 0x61, 0x4d, 0xa4, 0x31, 0x36, 0x91, 0x9d, - 0x53, 0x57, 0xb9, 0x9e, 0x16, 0xa6, 0x0d, 0x28, 0xf1, 0x14, 0x70, 0xae, 0x43, 0x3d, 0x73, 0x7b, - 0x30, 0xdd, 0x9e, 0x50, 0x18, 0xcd, 0x1d, 0x36, 0x13, 0xe7, 0x25, 0xb6, 0xb8, 0x71, 0xd7, 0xf2, - 0x53, 0x80, 0x53, 0xad, 0xc3, 0x67, 0xd4, 0xc6, 0x58, 0xdf, 0xd7, 0x10, 0x21, 0x06, 0xdb, 0x82, - 0x3a, 0x4e, 0x22, 0x2b, 0x37, 0xf9, 0x4e, 0x2b, 0x22, 0x43, 0xf8, 0x09, 0xd4, 0xc6, 0xc9, 0xf2, - 0x82, 0x0d, 0x5d, 0xbc, 0xfa, 0x53, 0xa8, 0x06, 0xd2, 0xca, 0x4c, 0x57, 0x55, 0x09, 0x24, 0x89, - 0x9c, 0x5b, 0xf0, 0x7f, 0x6f, 0xf4, 0xe3, 0xec, 0x13, 0x28, 0x8f, 0xfd, 0xa9, 0xa6, 0xa2, 0x8f, - 0x8d, 0x9a, 0x9d, 0x39, 0xff, 0xca, 0x01, 0xa4, 0x91, 0xc5, 0x7c, 0xc5, 0xea, 0x8d, 0x9c, 0x55, - 0x53, 0xad, 0xa7, 0x50, 0x9d, 0xd9, 0x3a, 0x60, 0x63, 0x76, 0x6d, 0x39, 0x1b, 0x5a, 0x71, 0x99, - 0x30, 0x15, 0x62, 0xdf, 0x56, 0x88, 0x0f, 0xe9, 0x99, 0x93, 0x1d, 0xa8, 0x19, 0xc9, 0xbe, 0x7d, - 0x20, 0xbd, 0x68, 0xdc, 0x4a, 0x36, 0xee, 0xc3, 0xda, 0xd2, 0x96, 0xef, 0xf9, 0x4d, 0x48, 0xeb, - 0x59, 0xf6, 0x96, 0xdd, 0x86, 0xb2, 0x69, 0x22, 0x31, 0x25, 0x70, 0x64, 0xd5, 0xd0, 0x98, 0x3a, - 0x86, 0xe3, 0xf8, 0x05, 0xd2, 0x3f, 0x76, 0xf6, 0xa1, 0x6c, 0x9e, 0x58, 0x6c, 0x07, 0x2a, 0xae, - 0x67, 0xae, 0x63, 0xa6, 0x24, 0xa0, 0xf0, 0x80, 0x60, 0x1e, 0x8b, 0x9d, 0xbf, 0xe5, 0x01, 0x52, - 0xfc, 0x03, 0xba, 0xd2, 0xaf, 0x61, 0x3d, 0x12, 0x9e, 0x0c, 0x46, 0xae, 0x5a, 0x90, 0xd4, 0x3e, - 0x25, 0x2e, 0x5b, 0x72, 0x81, 0x99, 0xe9, 0x50, 0x0b, 0xef, 0xee, 0x50, 0x77, 0xa0, 0xe8, 0xc9, - 0x70, 0x61, 0x3f, 0x14, 0x6c, 0xf9, 0x20, 0x1d, 0x19, 0x2e, 0xf0, 0x41, 0x89, 0x0c, 0xd6, 0x82, - 0xf2, 0xec, 0x8c, 0x1e, 0x9d, 0xa6, 0x61, 0xbf, 0xba, 0xcc, 0x7d, 0x78, 0x86, 0x63, 0x7c, 0xa2, - 0x1a, 0x16, 0xbb, 0x05, 0xa5, 0xd9, 0xd9, 0xc8, 0x57, 0xd4, 0xdb, 0xd6, 0x4d, 0x67, 0x98, 0xa5, - 0x77, 0x7d, 0x85, 0x0f, 0x51, 0xe2, 0x30, 0x07, 0xf2, 0x6a, 0xd6, 0xac, 0x10, 0xb3, 0x71, 0xc1, - 0x9b, 0xb3, 0xc3, 0x15, 0x9e, 0x57, 0xb3, 0x76, 0x15, 0xca, 0xc6, 0xaf, 0xce, 0x1f, 0x0b, 0xb0, - 0xbe, 0x6c, 0x25, 0xe6, 0x41, 0xa4, 0xbc, 0x38, 0x0f, 0x22, 0xe5, 0x25, 0xcd, 0x7b, 0x3e, 0xd3, - 0xbc, 0x3b, 0x50, 0x92, 0x2f, 0x02, 0xa1, 0xb2, 0xaf, 0xeb, 0xce, 0xa9, 0x7c, 0x11, 0x60, 0x9b, - 0x6a, 0x44, 0x4b, 0x5d, 0x5f, 0xc9, 0x76, 0x7d, 0x37, 0x60, 0x6d, 0x2c, 0xa7, 0x53, 0xf9, 0x62, - 0xb8, 0x98, 0x4d, 0xfd, 0xe0, 0xcc, 0xb6, 0x7e, 0xcb, 0x20, 0xdb, 0x81, 0x2b, 0x23, 0x5f, 0xa1, - 0x39, 0x1d, 0x19, 0x68, 0x11, 0xd0, 0x7b, 0x05, 0x79, 0x17, 0x61, 0xf6, 0x0d, 0x6c, 0xbb, 0x5a, - 0x8b, 0x59, 0xa8, 0x1f, 0x07, 0xa1, 0xeb, 0x9d, 0x75, 0xa5, 0x47, 0x77, 0x76, 0x16, 0xba, 0xda, - 0x3f, 0xf1, 0xa7, 0xf8, 0x34, 0xab, 0xd0, 0xd2, 0x77, 0xf2, 0xd8, 0xe7, 0xb0, 0xee, 0x29, 0xe1, - 0x6a, 0xd1, 0x15, 0x91, 0x3e, 0x76, 0xf5, 0x69, 0xb3, 0x4a, 0x2b, 0x2f, 0xa0, 0x78, 0x06, 0x17, - 0xad, 0x7d, 0xea, 0x4f, 0x47, 0x9e, 0xab, 0x46, 0xcd, 0x9a, 0x39, 0xc3, 0x12, 0xc8, 0x5a, 0xc0, - 0x08, 0xe8, 0xcd, 0x42, 0xbd, 0x48, 0xa8, 0x40, 0xd4, 0x4b, 0x24, 0x58, 0x38, 0xb5, 0x3f, 0x13, - 0x91, 0x76, 0x67, 0x21, 0xfd, 0x2b, 0x50, 0xe0, 0x29, 0xe0, 0x7c, 0x9b, 0x83, 0xc6, 0xc5, 0x14, - 0x41, 0x07, 0x87, 0x68, 0xa6, 0xbd, 0x6c, 0x38, 0x4e, 0x9c, 0x9e, 0xcf, 0x38, 0x3d, 0xfe, 0x42, - 0x15, 0x32, 0x5f, 0xa8, 0x24, 0x80, 0xc5, 0xb7, 0x07, 0x70, 0xc9, 0xa4, 0xd2, 0x45, 0x93, 0x7e, - 0x97, 0x83, 0x2b, 0x17, 0xd2, 0xf0, 0xbd, 0x2d, 0xda, 0x86, 0xfa, 0xcc, 0x3d, 0x13, 0xc7, 0xae, - 0xa2, 0xe0, 0x16, 0x4c, 0x0b, 0x97, 0x81, 0xfe, 0x0b, 0xf6, 0x05, 0xb0, 0x9a, 0xcd, 0xfd, 0x4b, - 0x6d, 0x8b, 0x43, 0x79, 0x24, 0xf5, 0x3d, 0x39, 0xb7, 0x5f, 0xbf, 0x38, 0x94, 0x31, 0xf8, 0x66, - 0xc0, 0x0b, 0x97, 0x04, 0xdc, 0x39, 0x82, 0x6a, 0x6c, 0x20, 0xdb, 0xb2, 0x4f, 0xf5, 0x5c, 0xfa, - 0x97, 0xd1, 0xe3, 0x48, 0x28, 0xb4, 0xdd, 0xbc, 0xdb, 0x3f, 0x83, 0xd2, 0x44, 0xc9, 0x79, 0x68, - 0x6b, 0xeb, 0x12, 0xc3, 0x48, 0x9c, 0x21, 0x54, 0x2c, 0xc2, 0x76, 0xa1, 0x7c, 0xb2, 0x38, 0x8a, - 0x9b, 0x0f, 0x7b, 0xb1, 0x71, 0x3e, 0xb2, 0x0c, 0xac, 0x16, 0x86, 0xc1, 0xae, 0x42, 0xf1, 0x64, - 0xd1, 0xef, 0x9a, 0x07, 0x19, 0xd6, 0x1c, 0x9c, 0xb5, 0xcb, 0xc6, 0x20, 0xe7, 0x01, 0xac, 0x66, - 0xd7, 0xa1, 0x53, 0x32, 0x4d, 0x0d, 0x8d, 0xd3, 0xe2, 0x9a, 0x7f, 0x47, 0x71, 0xdd, 0xdd, 0x81, - 0x8a, 0xfd, 0x53, 0x84, 0xd5, 0xa0, 0xf4, 0xf8, 0x68, 0xd8, 0x7b, 0xd4, 0x58, 0x61, 0x55, 0x28, - 0x1e, 0x0e, 0x86, 0x8f, 0x1a, 0x39, 0x1c, 0x1d, 0x0d, 0x8e, 0x7a, 0x8d, 0xfc, 0xee, 0x4d, 0x58, - 0xcd, 0xfe, 0x2d, 0xc2, 0xea, 0x50, 0x19, 0x1e, 0x1c, 0x75, 0xdb, 0x83, 0x5f, 0x35, 0x56, 0xd8, - 0x2a, 0x54, 0xfb, 0x47, 0xc3, 0x5e, 0xe7, 0x31, 0xef, 0x35, 0x72, 0xbb, 0xbf, 0x84, 0x5a, 0xf2, - 0x72, 0x47, 0x0d, 0xed, 0xfe, 0x51, 0xb7, 0xb1, 0xc2, 0x00, 0xca, 0xc3, 0x5e, 0x87, 0xf7, 0x50, - 0x6f, 0x05, 0x0a, 0xc3, 0xe1, 0x61, 0x23, 0x8f, 0xbb, 0x76, 0x0e, 0x3a, 0x87, 0xbd, 0x46, 0x01, - 0x87, 0x8f, 0x1e, 0x1e, 0xdf, 0x1b, 0x36, 0x8a, 0xbb, 0x5f, 0xc2, 0x95, 0x0b, 0x2f, 0x67, 0x5a, - 0x7d, 0x78, 0xc0, 0x7b, 0xa8, 0xa9, 0x0e, 0x95, 0x63, 0xde, 0x7f, 0x72, 0xf0, 0xa8, 0xd7, 0xc8, - 0xa1, 0xe0, 0xc1, 0xa0, 0x73, 0xbf, 0xd7, 0x6d, 0xe4, 0xdb, 0xd7, 0xbe, 0x7b, 0xb5, 0x99, 0xfb, - 0xfe, 0xd5, 0x66, 0xee, 0x87, 0x57, 0x9b, 0xb9, 0x7f, 0xbe, 0xda, 0xcc, 0x7d, 0xfb, 0x7a, 0x73, - 0xe5, 0xfb, 0xd7, 0x9b, 0x2b, 0x3f, 0xbc, 0xde, 0x5c, 0x39, 0x29, 0xd3, 0x9f, 0x94, 0x5f, 0xfc, - 0x3b, 0x00, 0x00, 0xff, 0xff, 0x7e, 0x60, 0x46, 0x7d, 0xe4, 0x14, 0x00, 0x00, + 0x6a, 0x7c, 0x89, 0xc6, 0xd6, 0x21, 0x3f, 0x18, 0x92, 0xa1, 0x6a, 0x3c, 0x3f, 0x18, 0xb2, 0x26, + 0x54, 0x9e, 0xb8, 0xca, 0x77, 0x03, 0x4d, 0x96, 0xa9, 0xf1, 0x78, 0xca, 0xae, 0x41, 0x6d, 0x30, + 0x7c, 0x22, 0x54, 0xe4, 0xcb, 0x80, 0xec, 0x51, 0xe3, 0x29, 0x81, 0x6d, 0x02, 0x0c, 0x86, 0xf7, + 0x84, 0x8b, 0x42, 0xa3, 0x66, 0x69, 0xbb, 0xb0, 0x53, 0xe3, 0x19, 0x8a, 0xf3, 0x6b, 0x28, 0x91, + 0x8f, 0xd8, 0x37, 0x50, 0x1e, 0xf9, 0x13, 0x11, 0x69, 0xa3, 0x4e, 0x7b, 0xff, 0xbb, 0x1f, 0xb7, + 0x56, 0xfe, 0xfe, 0xe3, 0xd6, 0x6e, 0x26, 0x18, 0x64, 0x28, 0x02, 0x4f, 0x06, 0xda, 0xf5, 0x03, + 0xa1, 0xa2, 0xbd, 0x89, 0xbc, 0x63, 0x96, 0xb4, 0xba, 0xf4, 0xe1, 0x56, 0x02, 0xbb, 0x09, 0x25, + 0x3f, 0x18, 0x89, 0x73, 0xd2, 0xbf, 0xd0, 0xfe, 0xc8, 0x8a, 0xaa, 0x0f, 0xe6, 0x3a, 0x9c, 0xeb, + 0x3e, 0xb2, 0xb8, 0x41, 0x38, 0xbf, 0xcf, 0x41, 0xd9, 0xc4, 0x00, 0xbb, 0x06, 0xc5, 0x99, 0xd0, + 0x2e, 0xed, 0x5f, 0xdf, 0xaf, 0xa2, 0x6d, 0x1f, 0x0a, 0xed, 0x72, 0xa2, 0x62, 0x78, 0xcd, 0xe4, + 0x1c, 0x6d, 0x9f, 0x4f, 0xc3, 0xeb, 0x21, 0x52, 0xb8, 0x65, 0xb0, 0x9f, 0x41, 0x25, 0x10, 0xfa, + 0x85, 0x54, 0x67, 0x64, 0xa3, 0x75, 0xe3, 0xf4, 0x23, 0xa1, 0x1f, 0xca, 0x91, 0xe0, 0x31, 0x8f, + 0xdd, 0x86, 0x6a, 0x24, 0xbc, 0xb9, 0xf2, 0xf5, 0x82, 0xec, 0xb5, 0xbe, 0xdf, 0xa0, 0x28, 0xb3, + 0x34, 0x02, 0x27, 0x08, 0xe7, 0x2f, 0x39, 0x28, 0xa2, 0x1a, 0x8c, 0x41, 0xd1, 0x55, 0x13, 0x13, + 0xdd, 0x35, 0x4e, 0x63, 0xd6, 0x80, 0x82, 0x08, 0x9e, 0x93, 0x46, 0x35, 0x8e, 0x43, 0xa4, 0x78, + 0x2f, 0x46, 0xd6, 0x47, 0x38, 0xc4, 0x75, 0xf3, 0x48, 0x28, 0xeb, 0x1a, 0x1a, 0xb3, 0x9b, 0x50, + 0x0b, 0x95, 0x3c, 0x5f, 0x3c, 0xc3, 0xd5, 0xa5, 0x4c, 0xe0, 0x21, 0xb1, 0x17, 0x3c, 0xe7, 0xd5, + 0xd0, 0x8e, 0xd8, 0x2e, 0x80, 0x38, 0xd7, 0xca, 0x3d, 0x94, 0x91, 0x8e, 0x9a, 0x65, 0x3a, 0x3b, + 0xc5, 0x3b, 0x12, 0xfa, 0xc7, 0x3c, 0xc3, 0x65, 0x1b, 0x50, 0x3d, 0x95, 0x91, 0x0e, 0xdc, 0x99, + 0x68, 0x56, 0x68, 0xbb, 0x64, 0xee, 0xfc, 0x35, 0x0f, 0x25, 0x32, 0x17, 0xdb, 0x41, 0xef, 0x84, + 0x73, 0xe3, 0xe8, 0x42, 0x9b, 0x59, 0xef, 0x00, 0xc5, 0x41, 0xe2, 0x1c, 0x8c, 0x89, 0x0d, 0xb4, + 0xd4, 0x54, 0x78, 0x5a, 0x2a, 0x1b, 0x8a, 0xc9, 0x1c, 0x8f, 0x35, 0xc2, 0x68, 0x31, 0x27, 0xa5, + 0x31, 0xbb, 0x05, 0x65, 0x49, 0x2e, 0xa6, 0xc3, 0xbe, 0xc5, 0xf1, 0x16, 0x82, 0xc2, 0x95, 0x70, + 0x47, 0x32, 0x98, 0x2e, 0xc8, 0x04, 0x55, 0x9e, 0xcc, 0xd9, 0x2d, 0xa8, 0x91, 0x4f, 0x1f, 0x2d, + 0x42, 0xd1, 0x2c, 0x93, 0x8f, 0xd6, 0x12, 0x7f, 0x23, 0x91, 0xa7, 0x7c, 0x4c, 0x62, 0xcf, 0xf5, + 0x4e, 0xc5, 0x20, 0xd4, 0xcd, 0xab, 0xa9, 0x2d, 0x3b, 0x96, 0xc6, 0x13, 0x2e, 0x8a, 0x8d, 0x84, + 0xa7, 0x84, 0x46, 0xe8, 0xc7, 0x04, 0x5d, 0xb3, 0xae, 0x37, 0x44, 0x9e, 0xf2, 0x99, 0x03, 0xe5, + 0xe1, 0xf0, 0x10, 0x91, 0x9f, 0xa4, 0x45, 0xc6, 0x50, 0xb8, 0xe5, 0x38, 0x7d, 0xa8, 0xc6, 0xdb, + 0x60, 0xc6, 0xf6, 0xbb, 0x36, 0x97, 0xf3, 0xfd, 0x2e, 0xbb, 0x03, 0x95, 0xe8, 0xd4, 0x55, 0x7e, + 0x30, 0x21, 0xdb, 0xad, 0xef, 0x7f, 0x94, 0x68, 0x35, 0x34, 0x74, 0x94, 0x14, 0x63, 0x1c, 0x09, + 0xb5, 0x44, 0x8d, 0x37, 0x64, 0x35, 0xa0, 0x30, 0xf7, 0x47, 0x24, 0x67, 0x8d, 0xe3, 0x10, 0x29, + 0x13, 0xdf, 0xc4, 0xd9, 0x1a, 0xc7, 0x21, 0x3a, 0x64, 0x26, 0x47, 0xa6, 0x24, 0xae, 0x71, 0x1a, + 0xa3, 0x8d, 0x65, 0xa8, 0x7d, 0x19, 0xb8, 0xd3, 0xd8, 0xc6, 0xf1, 0xdc, 0x99, 0xc6, 0xe7, 0xfb, + 0x9f, 0xec, 0xf6, 0x9b, 0x1c, 0x54, 0xe3, 0x3a, 0x8e, 0x45, 0xc9, 0x1f, 0x89, 0x40, 0xfb, 0x63, + 0x5f, 0x28, 0xbb, 0x71, 0x86, 0xc2, 0xee, 0x40, 0xc9, 0xd5, 0x5a, 0xc5, 0xa9, 0xfe, 0xff, 0xd9, + 0x4b, 0xa0, 0x75, 0x80, 0x9c, 0x5e, 0xa0, 0xd5, 0x82, 0x1b, 0xd4, 0xc6, 0x57, 0x00, 0x29, 0x11, + 0x75, 0x3d, 0x13, 0x0b, 0x2b, 0x15, 0x87, 0xec, 0x2a, 0x94, 0x9e, 0xbb, 0xd3, 0xb9, 0xb0, 0x31, + 0x6c, 0x26, 0x5f, 0xe7, 0xbf, 0xca, 0x39, 0x7f, 0xce, 0x43, 0xc5, 0x5e, 0x0a, 0xec, 0x36, 0x54, + 0xe8, 0x52, 0xb0, 0x1a, 0x5d, 0x9e, 0x18, 0x31, 0x84, 0xed, 0x25, 0xb7, 0x5d, 0x46, 0x47, 0x2b, + 0xca, 0xdc, 0x7a, 0x56, 0xc7, 0xf4, 0xee, 0x2b, 0x8c, 0xc4, 0xd8, 0x5e, 0x6b, 0xeb, 0x88, 0xee, + 0x8a, 0xb1, 0x1f, 0xf8, 0x68, 0x1f, 0x8e, 0x2c, 0x76, 0x3b, 0x3e, 0x75, 0x91, 0x24, 0x7e, 0x92, + 0x95, 0xf8, 0xe6, 0xa1, 0xfb, 0x50, 0xcf, 0x6c, 0x73, 0xc9, 0xa9, 0x6f, 0x64, 0x4f, 0x6d, 0xb7, + 0x24, 0x71, 0xe6, 0x4e, 0x4e, 0xad, 0xf0, 0x1f, 0xd8, 0xef, 0x4b, 0x80, 0x54, 0xe4, 0xfb, 0x17, + 0x16, 0xe7, 0x65, 0x01, 0x60, 0x10, 0x62, 0x59, 0x1d, 0xb9, 0x54, 0xdb, 0x57, 0xfd, 0x49, 0x20, + 0x95, 0x78, 0x46, 0xa9, 0x4a, 0xeb, 0xab, 0xbc, 0x6e, 0x68, 0x94, 0x31, 0xec, 0x00, 0xea, 0x23, + 0x11, 0x79, 0xca, 0xa7, 0x80, 0xb2, 0x46, 0xdf, 0xc2, 0x33, 0xa5, 0x72, 0x5a, 0xdd, 0x14, 0x61, + 0x6c, 0x95, 0x5d, 0xc3, 0xf6, 0x61, 0x55, 0x9c, 0x87, 0x52, 0x69, 0xbb, 0x8b, 0xe9, 0x1d, 0xae, + 0x98, 0x2e, 0x04, 0xe9, 0xb4, 0x13, 0xaf, 0x8b, 0x74, 0xc2, 0x5c, 0x28, 0x7a, 0x6e, 0x68, 0x2e, + 0xce, 0xfa, 0x7e, 0xf3, 0xc2, 0x7e, 0x1d, 0x37, 0x34, 0x46, 0x6b, 0x7f, 0x81, 0x67, 0x7d, 0xf9, + 0x8f, 0xad, 0x5b, 0x99, 0xdb, 0x72, 0x26, 0x4f, 0x16, 0x7b, 0x14, 0x2f, 0x67, 0xbe, 0xde, 0x9b, + 0x6b, 0x7f, 0xba, 0xe7, 0x86, 0x3e, 0x8a, 0xc3, 0x85, 0xfd, 0x2e, 0x27, 0xd1, 0x1b, 0xbf, 0x80, + 0xc6, 0x45, 0xbd, 0x3f, 0xc4, 0x07, 0x1b, 0x77, 0xa1, 0x96, 0xe8, 0xf1, 0xae, 0x85, 0xd5, 0xac, + 0xf3, 0xfe, 0x94, 0x83, 0xb2, 0xc9, 0x2a, 0x76, 0x17, 0x6a, 0x53, 0xe9, 0xb9, 0xa8, 0x40, 0xdc, + 0xbe, 0x7d, 0x9a, 0x26, 0x5d, 0xeb, 0x41, 0xcc, 0x33, 0x56, 0x4d, 0xb1, 0x18, 0x64, 0x7e, 0x30, + 0x96, 0x71, 0x16, 0xac, 0xa7, 0x8b, 0xfa, 0xc1, 0x58, 0x72, 0xc3, 0xdc, 0xb8, 0x0f, 0xeb, 0xcb, + 0x22, 0x2e, 0xd1, 0xf3, 0xfa, 0x72, 0xb8, 0x52, 0x5d, 0x4e, 0x16, 0x65, 0xd5, 0xbe, 0x0b, 0xb5, + 0x84, 0xce, 0x76, 0xdf, 0x54, 0x7c, 0x35, 0xbb, 0x32, 0xa3, 0xab, 0x33, 0x05, 0x48, 0x55, 0xc3, + 0x62, 0x85, 0x7d, 0x22, 0xdd, 0x95, 0x46, 0x8d, 0x64, 0x4e, 0x77, 0x9b, 0xab, 0x5d, 0x52, 0x65, + 0x95, 0xd3, 0x98, 0xb5, 0x00, 0x46, 0x49, 0xc2, 0xbe, 0x25, 0x8d, 0x33, 0x08, 0x67, 0x00, 0xd5, + 0x58, 0x09, 0xb6, 0x0d, 0xf5, 0xc8, 0xee, 0x8c, 0x5d, 0x11, 0x6e, 0x57, 0xe2, 0x59, 0x12, 0x76, + 0x37, 0xca, 0x0d, 0x26, 0x62, 0xa9, 0xbb, 0xe1, 0x48, 0xe1, 0x96, 0xe1, 0x3c, 0x85, 0x12, 0x11, + 0x30, 0xcd, 0x22, 0xed, 0x2a, 0x6d, 0x1b, 0x25, 0xd3, 0x38, 0xc8, 0x88, 0xb6, 0x6d, 0x17, 0x31, + 0x10, 0xb9, 0x01, 0xb0, 0x1b, 0xd8, 0x9e, 0x8c, 0xac, 0x45, 0x2f, 0xc3, 0x21, 0xdb, 0xf9, 0x39, + 0x54, 0x63, 0x32, 0x9e, 0xfc, 0x81, 0x1f, 0x08, 0xab, 0x22, 0x8d, 0xb1, 0xc1, 0xec, 0x9c, 0xba, + 0xca, 0xf5, 0xb4, 0x30, 0x6d, 0x40, 0x89, 0xa7, 0x04, 0xe7, 0x3a, 0xd4, 0x33, 0xd9, 0x83, 0xe1, + 0xf6, 0x84, 0xdc, 0x68, 0x72, 0xd8, 0x4c, 0x9c, 0x97, 0xd8, 0xfe, 0xc6, 0x1d, 0xcd, 0x4f, 0x01, + 0x4e, 0xb5, 0x0e, 0x9f, 0x51, 0x8b, 0x63, 0x6d, 0x5f, 0x43, 0x0a, 0x21, 0xd8, 0x16, 0xd4, 0x71, + 0x12, 0x59, 0xbe, 0x89, 0x77, 0x5a, 0x11, 0x19, 0xc0, 0x4f, 0xa0, 0x36, 0x4e, 0x96, 0x17, 0xac, + 0xeb, 0xe2, 0xd5, 0x9f, 0x42, 0x35, 0x90, 0x96, 0x67, 0x3a, 0xae, 0x4a, 0x20, 0x89, 0xe5, 0xdc, + 0x82, 0xff, 0x7b, 0xa3, 0x57, 0x67, 0x9f, 0x40, 0x79, 0xec, 0x4f, 0x35, 0x15, 0x7d, 0x6c, 0xe2, + 0xec, 0xcc, 0xf9, 0x57, 0x0e, 0x20, 0xf5, 0x2c, 0xc6, 0x2b, 0x56, 0x6f, 0xc4, 0xac, 0x9a, 0x6a, + 0x3d, 0x85, 0xea, 0xcc, 0xd6, 0x01, 0xeb, 0xb3, 0x6b, 0xcb, 0xd1, 0xd0, 0x8a, 0xcb, 0x84, 0xa9, + 0x10, 0xfb, 0xb6, 0x42, 0x7c, 0x48, 0x3f, 0x9d, 0xec, 0x40, 0xcd, 0x48, 0xf6, 0x5d, 0x04, 0x69, + 0xa2, 0x71, 0xcb, 0xd9, 0xb8, 0x0f, 0x6b, 0x4b, 0x5b, 0xbe, 0xe7, 0x9d, 0x90, 0xd6, 0xb3, 0x6c, + 0x96, 0xdd, 0x86, 0xb2, 0x69, 0x30, 0x31, 0x24, 0x70, 0x64, 0xc5, 0xd0, 0x98, 0x3a, 0x86, 0xe3, + 0xf8, 0x75, 0xd2, 0x3f, 0x76, 0xf6, 0xa1, 0x6c, 0x9e, 0x5f, 0x6c, 0x07, 0x2a, 0xae, 0x67, 0xd2, + 0x31, 0x53, 0x12, 0x90, 0x79, 0x40, 0x64, 0x1e, 0xb3, 0x9d, 0xbf, 0xe5, 0x01, 0x52, 0xfa, 0x07, + 0x74, 0xa5, 0x5f, 0xc3, 0x7a, 0x24, 0x3c, 0x19, 0x8c, 0x5c, 0xb5, 0x20, 0xae, 0x7d, 0x66, 0x5c, + 0xb6, 0xe4, 0x02, 0x32, 0xd3, 0xa1, 0x16, 0xde, 0xdd, 0xa1, 0xee, 0x40, 0xd1, 0x93, 0xe1, 0xc2, + 0x5e, 0x14, 0x6c, 0xf9, 0x20, 0x1d, 0x19, 0x2e, 0xf0, 0xb1, 0x89, 0x08, 0xd6, 0x82, 0xf2, 0xec, + 0x8c, 0x1e, 0xa4, 0xa6, 0x99, 0xbf, 0xba, 0x8c, 0x7d, 0x78, 0x86, 0x63, 0x7c, 0xbe, 0x1a, 0x14, + 0xbb, 0x05, 0xa5, 0xd9, 0xd9, 0xc8, 0x57, 0xd4, 0xdb, 0xd6, 0x4d, 0x67, 0x98, 0x85, 0x77, 0x7d, + 0x85, 0x8f, 0x54, 0xc2, 0x30, 0x07, 0xf2, 0x6a, 0x46, 0xfd, 0x7c, 0xdd, 0xbc, 0x54, 0x32, 0xd6, + 0x9c, 0x1d, 0xae, 0xf0, 0xbc, 0x9a, 0xb5, 0xab, 0x50, 0x36, 0x76, 0x75, 0xfe, 0x58, 0x80, 0xf5, + 0x65, 0x2d, 0x31, 0x0e, 0x22, 0xe5, 0xc5, 0x71, 0x10, 0x29, 0x2f, 0x69, 0xde, 0xf3, 0x99, 0xe6, + 0xdd, 0x81, 0x92, 0x7c, 0x11, 0x08, 0x95, 0x7d, 0x79, 0x77, 0x4e, 0xe5, 0x8b, 0x00, 0xdb, 0x54, + 0xc3, 0x5a, 0xea, 0xfa, 0x4a, 0xb6, 0xeb, 0xbb, 0x01, 0x6b, 0x63, 0x39, 0x9d, 0xca, 0x17, 0xc3, + 0xc5, 0x6c, 0xea, 0x07, 0x67, 0xb6, 0xf5, 0x5b, 0x26, 0xb2, 0x1d, 0xb8, 0x32, 0xf2, 0x15, 0xaa, + 0xd3, 0x91, 0x81, 0x16, 0x01, 0xbd, 0x65, 0x10, 0x77, 0x91, 0xcc, 0xbe, 0x81, 0x6d, 0x57, 0x6b, + 0x31, 0x0b, 0xf5, 0xe3, 0x20, 0x74, 0xbd, 0xb3, 0xae, 0xf4, 0x28, 0x67, 0x67, 0xa1, 0xab, 0xfd, + 0x13, 0x7f, 0x8a, 0xcf, 0xb6, 0x0a, 0x2d, 0x7d, 0x27, 0x8e, 0x7d, 0x0e, 0xeb, 0x9e, 0x12, 0xae, + 0x16, 0x5d, 0x11, 0xe9, 0x63, 0x57, 0x9f, 0x36, 0xab, 0xb4, 0xf2, 0x02, 0x15, 0xcf, 0xe0, 0xa2, + 0xb6, 0x4f, 0xfd, 0xe9, 0xc8, 0x73, 0xd5, 0xa8, 0x59, 0x33, 0x67, 0x58, 0x22, 0xb2, 0x16, 0x30, + 0x22, 0xf4, 0x66, 0xa1, 0x5e, 0x24, 0x50, 0x20, 0xe8, 0x25, 0x1c, 0x2c, 0x9c, 0xda, 0x9f, 0x89, + 0x48, 0xbb, 0xb3, 0x90, 0xfe, 0x18, 0x14, 0x78, 0x4a, 0x70, 0xbe, 0xcd, 0x41, 0xe3, 0x62, 0x88, + 0xa0, 0x81, 0x43, 0x54, 0xd3, 0x26, 0x1b, 0x8e, 0x13, 0xa3, 0xe7, 0x33, 0x46, 0x8f, 0x6f, 0xa8, + 0x42, 0xe6, 0x86, 0x4a, 0x1c, 0x58, 0x7c, 0xbb, 0x03, 0x97, 0x54, 0x2a, 0x5d, 0x54, 0xe9, 0x77, + 0x39, 0xb8, 0x72, 0x21, 0x0c, 0xdf, 0x5b, 0xa3, 0x6d, 0xa8, 0xcf, 0xdc, 0x33, 0x71, 0xec, 0x2a, + 0x72, 0x6e, 0xc1, 0xb4, 0x70, 0x19, 0xd2, 0x7f, 0x41, 0xbf, 0x00, 0x56, 0xb3, 0xb1, 0x7f, 0xa9, + 0x6e, 0xb1, 0x2b, 0x8f, 0xa4, 0xbe, 0x27, 0xe7, 0xf6, 0xf6, 0x8b, 0x5d, 0x19, 0x13, 0xdf, 0x74, + 0x78, 0xe1, 0x12, 0x87, 0x3b, 0x47, 0x50, 0x8d, 0x15, 0x64, 0x5b, 0xf6, 0x19, 0x9f, 0x4b, 0x7f, + 0x27, 0x3d, 0x8e, 0x84, 0x42, 0xdd, 0xcd, 0x9b, 0xfe, 0x33, 0x28, 0x4d, 0x94, 0x9c, 0x87, 0xb6, + 0xb6, 0x2e, 0x21, 0x0c, 0xc7, 0x19, 0x42, 0xc5, 0x52, 0xd8, 0x2e, 0x94, 0x4f, 0x16, 0x47, 0x71, + 0xf3, 0x61, 0x13, 0x1b, 0xe7, 0x23, 0x8b, 0xc0, 0x6a, 0x61, 0x10, 0xec, 0x2a, 0x14, 0x4f, 0x16, + 0xfd, 0xae, 0x79, 0x90, 0x61, 0xcd, 0xc1, 0x59, 0xbb, 0x6c, 0x14, 0x72, 0x1e, 0xc0, 0x6a, 0x76, + 0x1d, 0x1a, 0x25, 0xd3, 0xd4, 0xd0, 0x38, 0x2d, 0xae, 0xf9, 0x77, 0x14, 0xd7, 0xdd, 0x1d, 0xa8, + 0xd8, 0x1f, 0x26, 0xac, 0x06, 0xa5, 0xc7, 0x47, 0xc3, 0xde, 0xa3, 0xc6, 0x0a, 0xab, 0x42, 0xf1, + 0x70, 0x30, 0x7c, 0xd4, 0xc8, 0xe1, 0xe8, 0x68, 0x70, 0xd4, 0x6b, 0xe4, 0x77, 0x6f, 0xc2, 0x6a, + 0xf6, 0x97, 0x09, 0xab, 0x43, 0x65, 0x78, 0x70, 0xd4, 0x6d, 0x0f, 0x7e, 0xd5, 0x58, 0x61, 0xab, + 0x50, 0xed, 0x1f, 0x0d, 0x7b, 0x9d, 0xc7, 0xbc, 0xd7, 0xc8, 0xed, 0xfe, 0x12, 0x6a, 0xc9, 0xcb, + 0x1d, 0x25, 0xb4, 0xfb, 0x47, 0xdd, 0xc6, 0x0a, 0x03, 0x28, 0x0f, 0x7b, 0x1d, 0xde, 0x43, 0xb9, + 0x15, 0x28, 0x0c, 0x87, 0x87, 0x8d, 0x3c, 0xee, 0xda, 0x39, 0xe8, 0x1c, 0xf6, 0x1a, 0x05, 0x1c, + 0x3e, 0x7a, 0x78, 0x7c, 0x6f, 0xd8, 0x28, 0xee, 0x7e, 0x09, 0x57, 0x2e, 0xbc, 0x9c, 0x69, 0xf5, + 0xe1, 0x01, 0xef, 0xa1, 0xa4, 0x3a, 0x54, 0x8e, 0x79, 0xff, 0xc9, 0xc1, 0xa3, 0x5e, 0x23, 0x87, + 0x8c, 0x07, 0x83, 0xce, 0xfd, 0x5e, 0xb7, 0x91, 0x6f, 0x5f, 0xfb, 0xee, 0xd5, 0x66, 0xee, 0xfb, + 0x57, 0x9b, 0xb9, 0x1f, 0x5e, 0x6d, 0xe6, 0xfe, 0xf9, 0x6a, 0x33, 0xf7, 0xed, 0xeb, 0xcd, 0x95, + 0xef, 0x5f, 0x6f, 0xae, 0xfc, 0xf0, 0x7a, 0x73, 0xe5, 0xa4, 0x4c, 0x3f, 0x30, 0xbf, 0xf8, 0x77, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x88, 0x01, 0x94, 0x00, 0x15, 0x00, 0x00, } func (m *Op) Marshal() (dAtA []byte, err error) { @@ -2784,6 +2793,13 @@ func (m *Meta) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Hostname) > 0 { + i -= len(m.Hostname) + copy(dAtA[i:], m.Hostname) + i = encodeVarintOps(dAtA, i, uint64(len(m.Hostname))) + i-- + dAtA[i] = 0x3a + } if len(m.ExtraHosts) > 0 { for iNdEx := len(m.ExtraHosts) - 1; iNdEx >= 0; iNdEx-- { { @@ -4663,6 +4679,10 @@ func (m *Meta) Size() (n int) { n += 1 + l + sovOps(uint64(l)) } } + l = len(m.Hostname) + if l > 0 { + n += 1 + l + sovOps(uint64(l)) + } return n } @@ -6359,6 +6379,38 @@ func (m *Meta) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Hostname", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOps + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthOps + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOps + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Hostname = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOps(dAtA[iNdEx:]) diff --git a/solver/pb/ops.proto b/solver/pb/ops.proto index 087c3461630f2..7a62214d86b17 100644 --- a/solver/pb/ops.proto +++ b/solver/pb/ops.proto @@ -57,6 +57,7 @@ message Meta { string user = 4; ProxyEnv proxy_env = 5; repeated HostIP extraHosts = 6; + string hostname = 7; } enum NetMode {