mirror of https://github.com/docker/cli.git
vendor: github.com/moby/buildkit ae7ff7174f73bcb4df89b97e1623b3fb0bfb0a0c
full diff: 4f4e030675...ae7ff7174f
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
d0a80bf445
commit
0dc9d17a2e
|
@ -46,7 +46,7 @@ github.com/Microsoft/go-winio 6c72808b55902eae4c5943626030
|
||||||
github.com/Microsoft/hcsshim b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2 # v0.8.7
|
github.com/Microsoft/hcsshim b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2 # v0.8.7
|
||||||
github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 # v1.0.3
|
github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 # v1.0.3
|
||||||
github.com/mitchellh/mapstructure f15292f7a699fcc1a38a80977f80a046874ba8ac
|
github.com/mitchellh/mapstructure f15292f7a699fcc1a38a80977f80a046874ba8ac
|
||||||
github.com/moby/buildkit 4f4e03067523b2fc5ca2f17514a5e75ad63e02fb
|
github.com/moby/buildkit ae7ff7174f73bcb4df89b97e1623b3fb0bfb0a0c
|
||||||
github.com/moby/sys 6154f11e6840c0d6b0dbb23f4125a6134b3013c9 # mountinfo/v0.1.3
|
github.com/moby/sys 6154f11e6840c0d6b0dbb23f4125a6134b3013c9 # mountinfo/v0.1.3
|
||||||
github.com/moby/term 063f2cd0b49dbb0752774d1cb649998d91424fea
|
github.com/moby/term 063f2cd0b49dbb0752774d1cb649998d91424fea
|
||||||
github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3
|
github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3
|
||||||
|
|
|
@ -1,112 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package containers
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gogo/protobuf/types"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Container represents the set of data pinned by a container. Unless otherwise
|
|
||||||
// noted, the resources here are considered in use by the container.
|
|
||||||
//
|
|
||||||
// The resources specified in this object are used to create tasks from the container.
|
|
||||||
type Container struct {
|
|
||||||
// ID uniquely identifies the container in a namespace.
|
|
||||||
//
|
|
||||||
// This property is required and cannot be changed after creation.
|
|
||||||
ID string
|
|
||||||
|
|
||||||
// Labels provide metadata extension for a container.
|
|
||||||
//
|
|
||||||
// These are optional and fully mutable.
|
|
||||||
Labels map[string]string
|
|
||||||
|
|
||||||
// Image specifies the image reference used for a container.
|
|
||||||
//
|
|
||||||
// This property is optional and mutable.
|
|
||||||
Image string
|
|
||||||
|
|
||||||
// Runtime specifies which runtime should be used when launching container
|
|
||||||
// tasks.
|
|
||||||
//
|
|
||||||
// This property is required and immutable.
|
|
||||||
Runtime RuntimeInfo
|
|
||||||
|
|
||||||
// Spec should carry the runtime specification used to implement the
|
|
||||||
// container.
|
|
||||||
//
|
|
||||||
// This field is required but mutable.
|
|
||||||
Spec *types.Any
|
|
||||||
|
|
||||||
// SnapshotKey specifies the snapshot key to use for the container's root
|
|
||||||
// filesystem. When starting a task from this container, a caller should
|
|
||||||
// look up the mounts from the snapshot service and include those on the
|
|
||||||
// task create request.
|
|
||||||
//
|
|
||||||
// This field is not required but mutable.
|
|
||||||
SnapshotKey string
|
|
||||||
|
|
||||||
// Snapshotter specifies the snapshotter name used for rootfs
|
|
||||||
//
|
|
||||||
// This field is not required but immutable.
|
|
||||||
Snapshotter string
|
|
||||||
|
|
||||||
// CreatedAt is the time at which the container was created.
|
|
||||||
CreatedAt time.Time
|
|
||||||
|
|
||||||
// UpdatedAt is the time at which the container was updated.
|
|
||||||
UpdatedAt time.Time
|
|
||||||
|
|
||||||
// Extensions stores client-specified metadata
|
|
||||||
Extensions map[string]types.Any
|
|
||||||
}
|
|
||||||
|
|
||||||
// RuntimeInfo holds runtime specific information
|
|
||||||
type RuntimeInfo struct {
|
|
||||||
Name string
|
|
||||||
Options *types.Any
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store interacts with the underlying container storage
|
|
||||||
type Store interface {
|
|
||||||
// Get a container using the id.
|
|
||||||
//
|
|
||||||
// Container object is returned on success. If the id is not known to the
|
|
||||||
// store, an error will be returned.
|
|
||||||
Get(ctx context.Context, id string) (Container, error)
|
|
||||||
|
|
||||||
// List returns containers that match one or more of the provided filters.
|
|
||||||
List(ctx context.Context, filters ...string) ([]Container, error)
|
|
||||||
|
|
||||||
// Create a container in the store from the provided container.
|
|
||||||
Create(ctx context.Context, container Container) (Container, error)
|
|
||||||
|
|
||||||
// Update the container with the provided container object. ID must be set.
|
|
||||||
//
|
|
||||||
// If one or more fieldpaths are provided, only the field corresponding to
|
|
||||||
// the fieldpaths will be mutated.
|
|
||||||
Update(ctx context.Context, container Container, fieldpaths ...string) (Container, error)
|
|
||||||
|
|
||||||
// Delete a container using the id.
|
|
||||||
//
|
|
||||||
// nil will be returned on success. If the container is not known to the
|
|
||||||
// store, ErrNotFound will be returned.
|
|
||||||
Delete(ctx context.Context, id string) error
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
const (
|
|
||||||
// AnnotationImageName is an annotation on a Descriptor in an index.json
|
|
||||||
// containing the `Name` value as used by an `Image` struct
|
|
||||||
AnnotationImageName = "io.containerd.image.name"
|
|
||||||
)
|
|
|
@ -1,256 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"sort"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/content"
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"golang.org/x/sync/errgroup"
|
|
||||||
"golang.org/x/sync/semaphore"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrSkipDesc is used to skip processing of a descriptor and
|
|
||||||
// its descendants.
|
|
||||||
ErrSkipDesc = fmt.Errorf("skip descriptor")
|
|
||||||
|
|
||||||
// ErrStopHandler is used to signify that the descriptor
|
|
||||||
// has been handled and should not be handled further.
|
|
||||||
// This applies only to a single descriptor in a handler
|
|
||||||
// chain and does not apply to descendant descriptors.
|
|
||||||
ErrStopHandler = fmt.Errorf("stop handler")
|
|
||||||
)
|
|
||||||
|
|
||||||
// Handler handles image manifests
|
|
||||||
type Handler interface {
|
|
||||||
Handle(ctx context.Context, desc ocispec.Descriptor) (subdescs []ocispec.Descriptor, err error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandlerFunc function implementing the Handler interface
|
|
||||||
type HandlerFunc func(ctx context.Context, desc ocispec.Descriptor) (subdescs []ocispec.Descriptor, err error)
|
|
||||||
|
|
||||||
// Handle image manifests
|
|
||||||
func (fn HandlerFunc) Handle(ctx context.Context, desc ocispec.Descriptor) (subdescs []ocispec.Descriptor, err error) {
|
|
||||||
return fn(ctx, desc)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handlers returns a handler that will run the handlers in sequence.
|
|
||||||
//
|
|
||||||
// A handler may return `ErrStopHandler` to stop calling additional handlers
|
|
||||||
func Handlers(handlers ...Handler) HandlerFunc {
|
|
||||||
return func(ctx context.Context, desc ocispec.Descriptor) (subdescs []ocispec.Descriptor, err error) {
|
|
||||||
var children []ocispec.Descriptor
|
|
||||||
for _, handler := range handlers {
|
|
||||||
ch, err := handler.Handle(ctx, desc)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Cause(err) == ErrStopHandler {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
children = append(children, ch...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return children, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Walk the resources of an image and call the handler for each. If the handler
|
|
||||||
// decodes the sub-resources for each image,
|
|
||||||
//
|
|
||||||
// This differs from dispatch in that each sibling resource is considered
|
|
||||||
// synchronously.
|
|
||||||
func Walk(ctx context.Context, handler Handler, descs ...ocispec.Descriptor) error {
|
|
||||||
for _, desc := range descs {
|
|
||||||
|
|
||||||
children, err := handler.Handle(ctx, desc)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Cause(err) == ErrSkipDesc {
|
|
||||||
continue // don't traverse the children.
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(children) > 0 {
|
|
||||||
if err := Walk(ctx, handler, children...); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispatch runs the provided handler for content specified by the descriptors.
|
|
||||||
// If the handler decode subresources, they will be visited, as well.
|
|
||||||
//
|
|
||||||
// Handlers for siblings are run in parallel on the provided descriptors. A
|
|
||||||
// handler may return `ErrSkipDesc` to signal to the dispatcher to not traverse
|
|
||||||
// any children.
|
|
||||||
//
|
|
||||||
// A concurrency limiter can be passed in to limit the number of concurrent
|
|
||||||
// handlers running. When limiter is nil, there is no limit.
|
|
||||||
//
|
|
||||||
// Typically, this function will be used with `FetchHandler`, often composed
|
|
||||||
// with other handlers.
|
|
||||||
//
|
|
||||||
// If any handler returns an error, the dispatch session will be canceled.
|
|
||||||
func Dispatch(ctx context.Context, handler Handler, limiter *semaphore.Weighted, descs ...ocispec.Descriptor) error {
|
|
||||||
eg, ctx2 := errgroup.WithContext(ctx)
|
|
||||||
for _, desc := range descs {
|
|
||||||
desc := desc
|
|
||||||
|
|
||||||
if limiter != nil {
|
|
||||||
if err := limiter.Acquire(ctx, 1); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
eg.Go(func() error {
|
|
||||||
desc := desc
|
|
||||||
|
|
||||||
children, err := handler.Handle(ctx2, desc)
|
|
||||||
if limiter != nil {
|
|
||||||
limiter.Release(1)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
if errors.Cause(err) == ErrSkipDesc {
|
|
||||||
return nil // don't traverse the children.
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(children) > 0 {
|
|
||||||
return Dispatch(ctx2, handler, limiter, children...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return eg.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
// ChildrenHandler decodes well-known manifest types and returns their children.
|
|
||||||
//
|
|
||||||
// This is useful for supporting recursive fetch and other use cases where you
|
|
||||||
// want to do a full walk of resources.
|
|
||||||
//
|
|
||||||
// One can also replace this with another implementation to allow descending of
|
|
||||||
// arbitrary types.
|
|
||||||
func ChildrenHandler(provider content.Provider) HandlerFunc {
|
|
||||||
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
return Children(ctx, provider, desc)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetChildrenLabels is a handler wrapper which sets labels for the content on
|
|
||||||
// the children returned by the handler and passes through the children.
|
|
||||||
// Must follow a handler that returns the children to be labeled.
|
|
||||||
func SetChildrenLabels(manager content.Manager, f HandlerFunc) HandlerFunc {
|
|
||||||
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
children, err := f(ctx, desc)
|
|
||||||
if err != nil {
|
|
||||||
return children, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(children) > 0 {
|
|
||||||
info := content.Info{
|
|
||||||
Digest: desc.Digest,
|
|
||||||
Labels: map[string]string{},
|
|
||||||
}
|
|
||||||
fields := []string{}
|
|
||||||
for i, ch := range children {
|
|
||||||
info.Labels[fmt.Sprintf("containerd.io/gc.ref.content.%d", i)] = ch.Digest.String()
|
|
||||||
fields = append(fields, fmt.Sprintf("labels.containerd.io/gc.ref.content.%d", i))
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := manager.Update(ctx, info, fields...)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return children, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// FilterPlatforms is a handler wrapper which limits the descriptors returned
|
|
||||||
// based on matching the specified platform matcher.
|
|
||||||
func FilterPlatforms(f HandlerFunc, m platforms.Matcher) HandlerFunc {
|
|
||||||
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
children, err := f(ctx, desc)
|
|
||||||
if err != nil {
|
|
||||||
return children, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var descs []ocispec.Descriptor
|
|
||||||
|
|
||||||
if m == nil {
|
|
||||||
descs = children
|
|
||||||
} else {
|
|
||||||
for _, d := range children {
|
|
||||||
if d.Platform == nil || m.Match(*d.Platform) {
|
|
||||||
descs = append(descs, d)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return descs, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// LimitManifests is a handler wrapper which filters the manifest descriptors
|
|
||||||
// returned using the provided platform.
|
|
||||||
// The results will be ordered according to the comparison operator and
|
|
||||||
// use the ordering in the manifests for equal matches.
|
|
||||||
// A limit of 0 or less is considered no limit.
|
|
||||||
func LimitManifests(f HandlerFunc, m platforms.MatchComparer, n int) HandlerFunc {
|
|
||||||
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
children, err := f(ctx, desc)
|
|
||||||
if err != nil {
|
|
||||||
return children, err
|
|
||||||
}
|
|
||||||
|
|
||||||
switch desc.MediaType {
|
|
||||||
case ocispec.MediaTypeImageIndex, MediaTypeDockerSchema2ManifestList:
|
|
||||||
sort.SliceStable(children, func(i, j int) bool {
|
|
||||||
if children[i].Platform == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if children[j].Platform == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return m.Less(*children[i].Platform, *children[j].Platform)
|
|
||||||
})
|
|
||||||
|
|
||||||
if n > 0 && len(children) > n {
|
|
||||||
children = children[:n]
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
// only limit manifests from an index
|
|
||||||
}
|
|
||||||
return children, nil
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,386 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"sort"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/content"
|
|
||||||
"github.com/containerd/containerd/errdefs"
|
|
||||||
"github.com/containerd/containerd/log"
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
digest "github.com/opencontainers/go-digest"
|
|
||||||
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Image provides the model for how containerd views container images.
|
|
||||||
type Image struct {
|
|
||||||
// Name of the image.
|
|
||||||
//
|
|
||||||
// To be pulled, it must be a reference compatible with resolvers.
|
|
||||||
//
|
|
||||||
// This field is required.
|
|
||||||
Name string
|
|
||||||
|
|
||||||
// Labels provide runtime decoration for the image record.
|
|
||||||
//
|
|
||||||
// There is no default behavior for how these labels are propagated. They
|
|
||||||
// only decorate the static metadata object.
|
|
||||||
//
|
|
||||||
// This field is optional.
|
|
||||||
Labels map[string]string
|
|
||||||
|
|
||||||
// Target describes the root content for this image. Typically, this is
|
|
||||||
// a manifest, index or manifest list.
|
|
||||||
Target ocispec.Descriptor
|
|
||||||
|
|
||||||
CreatedAt, UpdatedAt time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteOptions provide options on image delete
|
|
||||||
type DeleteOptions struct {
|
|
||||||
Synchronous bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteOpt allows configuring a delete operation
|
|
||||||
type DeleteOpt func(context.Context, *DeleteOptions) error
|
|
||||||
|
|
||||||
// SynchronousDelete is used to indicate that an image deletion and removal of
|
|
||||||
// the image resources should occur synchronously before returning a result.
|
|
||||||
func SynchronousDelete() DeleteOpt {
|
|
||||||
return func(ctx context.Context, o *DeleteOptions) error {
|
|
||||||
o.Synchronous = true
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store and interact with images
|
|
||||||
type Store interface {
|
|
||||||
Get(ctx context.Context, name string) (Image, error)
|
|
||||||
List(ctx context.Context, filters ...string) ([]Image, error)
|
|
||||||
Create(ctx context.Context, image Image) (Image, error)
|
|
||||||
|
|
||||||
// Update will replace the data in the store with the provided image. If
|
|
||||||
// one or more fieldpaths are provided, only those fields will be updated.
|
|
||||||
Update(ctx context.Context, image Image, fieldpaths ...string) (Image, error)
|
|
||||||
|
|
||||||
Delete(ctx context.Context, name string, opts ...DeleteOpt) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO(stevvooe): Many of these functions make strong platform assumptions,
|
|
||||||
// which are untrue in a lot of cases. More refactoring must be done here to
|
|
||||||
// make this work in all cases.
|
|
||||||
|
|
||||||
// Config resolves the image configuration descriptor.
|
|
||||||
//
|
|
||||||
// The caller can then use the descriptor to resolve and process the
|
|
||||||
// configuration of the image.
|
|
||||||
func (image *Image) Config(ctx context.Context, provider content.Provider, platform platforms.MatchComparer) (ocispec.Descriptor, error) {
|
|
||||||
return Config(ctx, provider, image.Target, platform)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RootFS returns the unpacked diffids that make up and images rootfs.
|
|
||||||
//
|
|
||||||
// These are used to verify that a set of layers unpacked to the expected
|
|
||||||
// values.
|
|
||||||
func (image *Image) RootFS(ctx context.Context, provider content.Provider, platform platforms.MatchComparer) ([]digest.Digest, error) {
|
|
||||||
desc, err := image.Config(ctx, provider, platform)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return RootFS(ctx, provider, desc)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Size returns the total size of an image's packed resources.
|
|
||||||
func (image *Image) Size(ctx context.Context, provider content.Provider, platform platforms.MatchComparer) (int64, error) {
|
|
||||||
var size int64
|
|
||||||
return size, Walk(ctx, Handlers(HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
if desc.Size < 0 {
|
|
||||||
return nil, errors.Errorf("invalid size %v in %v (%v)", desc.Size, desc.Digest, desc.MediaType)
|
|
||||||
}
|
|
||||||
size += desc.Size
|
|
||||||
return nil, nil
|
|
||||||
}), LimitManifests(FilterPlatforms(ChildrenHandler(provider), platform), platform, 1)), image.Target)
|
|
||||||
}
|
|
||||||
|
|
||||||
type platformManifest struct {
|
|
||||||
p *ocispec.Platform
|
|
||||||
m *ocispec.Manifest
|
|
||||||
}
|
|
||||||
|
|
||||||
// Manifest resolves a manifest from the image for the given platform.
|
|
||||||
//
|
|
||||||
// When a manifest descriptor inside of a manifest index does not have
|
|
||||||
// a platform defined, the platform from the image config is considered.
|
|
||||||
//
|
|
||||||
// If the descriptor points to a non-index manifest, then the manifest is
|
|
||||||
// unmarshalled and returned without considering the platform inside of the
|
|
||||||
// config.
|
|
||||||
//
|
|
||||||
// TODO(stevvooe): This violates the current platform agnostic approach to this
|
|
||||||
// package by returning a specific manifest type. We'll need to refactor this
|
|
||||||
// to return a manifest descriptor or decide that we want to bring the API in
|
|
||||||
// this direction because this abstraction is not needed.`
|
|
||||||
func Manifest(ctx context.Context, provider content.Provider, image ocispec.Descriptor, platform platforms.MatchComparer) (ocispec.Manifest, error) {
|
|
||||||
var (
|
|
||||||
limit = 1
|
|
||||||
m []platformManifest
|
|
||||||
wasIndex bool
|
|
||||||
)
|
|
||||||
|
|
||||||
if err := Walk(ctx, HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
switch desc.MediaType {
|
|
||||||
case MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
|
|
||||||
p, err := content.ReadBlob(ctx, provider, desc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var manifest ocispec.Manifest
|
|
||||||
if err := json.Unmarshal(p, &manifest); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if desc.Digest != image.Digest && platform != nil {
|
|
||||||
if desc.Platform != nil && !platform.Match(*desc.Platform) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if desc.Platform == nil {
|
|
||||||
p, err := content.ReadBlob(ctx, provider, manifest.Config)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var image ocispec.Image
|
|
||||||
if err := json.Unmarshal(p, &image); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if !platform.Match(platforms.Normalize(ocispec.Platform{OS: image.OS, Architecture: image.Architecture})) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
m = append(m, platformManifest{
|
|
||||||
p: desc.Platform,
|
|
||||||
m: &manifest,
|
|
||||||
})
|
|
||||||
|
|
||||||
return nil, nil
|
|
||||||
case MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
|
|
||||||
p, err := content.ReadBlob(ctx, provider, desc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var idx ocispec.Index
|
|
||||||
if err := json.Unmarshal(p, &idx); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if platform == nil {
|
|
||||||
return idx.Manifests, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var descs []ocispec.Descriptor
|
|
||||||
for _, d := range idx.Manifests {
|
|
||||||
if d.Platform == nil || platform.Match(*d.Platform) {
|
|
||||||
descs = append(descs, d)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sort.SliceStable(descs, func(i, j int) bool {
|
|
||||||
if descs[i].Platform == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if descs[j].Platform == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return platform.Less(*descs[i].Platform, *descs[j].Platform)
|
|
||||||
})
|
|
||||||
|
|
||||||
wasIndex = true
|
|
||||||
|
|
||||||
if len(descs) > limit {
|
|
||||||
return descs[:limit], nil
|
|
||||||
}
|
|
||||||
return descs, nil
|
|
||||||
}
|
|
||||||
return nil, errors.Wrapf(errdefs.ErrNotFound, "unexpected media type %v for %v", desc.MediaType, desc.Digest)
|
|
||||||
}), image); err != nil {
|
|
||||||
return ocispec.Manifest{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(m) == 0 {
|
|
||||||
err := errors.Wrapf(errdefs.ErrNotFound, "manifest %v", image.Digest)
|
|
||||||
if wasIndex {
|
|
||||||
err = errors.Wrapf(errdefs.ErrNotFound, "no match for platform in manifest %v", image.Digest)
|
|
||||||
}
|
|
||||||
return ocispec.Manifest{}, err
|
|
||||||
}
|
|
||||||
return *m[0].m, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Config resolves the image configuration descriptor using a content provided
|
|
||||||
// to resolve child resources on the image.
|
|
||||||
//
|
|
||||||
// The caller can then use the descriptor to resolve and process the
|
|
||||||
// configuration of the image.
|
|
||||||
func Config(ctx context.Context, provider content.Provider, image ocispec.Descriptor, platform platforms.MatchComparer) (ocispec.Descriptor, error) {
|
|
||||||
manifest, err := Manifest(ctx, provider, image, platform)
|
|
||||||
if err != nil {
|
|
||||||
return ocispec.Descriptor{}, err
|
|
||||||
}
|
|
||||||
return manifest.Config, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Platforms returns one or more platforms supported by the image.
|
|
||||||
func Platforms(ctx context.Context, provider content.Provider, image ocispec.Descriptor) ([]ocispec.Platform, error) {
|
|
||||||
var platformSpecs []ocispec.Platform
|
|
||||||
return platformSpecs, Walk(ctx, Handlers(HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
if desc.Platform != nil {
|
|
||||||
platformSpecs = append(platformSpecs, *desc.Platform)
|
|
||||||
return nil, ErrSkipDesc
|
|
||||||
}
|
|
||||||
|
|
||||||
switch desc.MediaType {
|
|
||||||
case MediaTypeDockerSchema2Config, ocispec.MediaTypeImageConfig:
|
|
||||||
p, err := content.ReadBlob(ctx, provider, desc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var image ocispec.Image
|
|
||||||
if err := json.Unmarshal(p, &image); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
platformSpecs = append(platformSpecs,
|
|
||||||
platforms.Normalize(ocispec.Platform{OS: image.OS, Architecture: image.Architecture}))
|
|
||||||
}
|
|
||||||
return nil, nil
|
|
||||||
}), ChildrenHandler(provider)), image)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check returns nil if the all components of an image are available in the
|
|
||||||
// provider for the specified platform.
|
|
||||||
//
|
|
||||||
// If available is true, the caller can assume that required represents the
|
|
||||||
// complete set of content required for the image.
|
|
||||||
//
|
|
||||||
// missing will have the components that are part of required but not avaiiable
|
|
||||||
// in the provider.
|
|
||||||
//
|
|
||||||
// If there is a problem resolving content, an error will be returned.
|
|
||||||
func Check(ctx context.Context, provider content.Provider, image ocispec.Descriptor, platform platforms.MatchComparer) (available bool, required, present, missing []ocispec.Descriptor, err error) {
|
|
||||||
mfst, err := Manifest(ctx, provider, image, platform)
|
|
||||||
if err != nil {
|
|
||||||
if errdefs.IsNotFound(err) {
|
|
||||||
return false, []ocispec.Descriptor{image}, nil, []ocispec.Descriptor{image}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return false, nil, nil, nil, errors.Wrapf(err, "failed to check image %v", image.Digest)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO(stevvooe): It is possible that referenced conponents could have
|
|
||||||
// children, but this is rare. For now, we ignore this and only verify
|
|
||||||
// that manifest components are present.
|
|
||||||
required = append([]ocispec.Descriptor{mfst.Config}, mfst.Layers...)
|
|
||||||
|
|
||||||
for _, desc := range required {
|
|
||||||
ra, err := provider.ReaderAt(ctx, desc)
|
|
||||||
if err != nil {
|
|
||||||
if errdefs.IsNotFound(err) {
|
|
||||||
missing = append(missing, desc)
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
return false, nil, nil, nil, errors.Wrapf(err, "failed to check image %v", desc.Digest)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ra.Close()
|
|
||||||
present = append(present, desc)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return true, required, present, missing, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Children returns the immediate children of content described by the descriptor.
|
|
||||||
func Children(ctx context.Context, provider content.Provider, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
|
||||||
var descs []ocispec.Descriptor
|
|
||||||
switch desc.MediaType {
|
|
||||||
case MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
|
|
||||||
p, err := content.ReadBlob(ctx, provider, desc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO(stevvooe): We just assume oci manifest, for now. There may be
|
|
||||||
// subtle differences from the docker version.
|
|
||||||
var manifest ocispec.Manifest
|
|
||||||
if err := json.Unmarshal(p, &manifest); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
descs = append(descs, manifest.Config)
|
|
||||||
descs = append(descs, manifest.Layers...)
|
|
||||||
case MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
|
|
||||||
p, err := content.ReadBlob(ctx, provider, desc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var index ocispec.Index
|
|
||||||
if err := json.Unmarshal(p, &index); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
descs = append(descs, index.Manifests...)
|
|
||||||
default:
|
|
||||||
if IsLayerType(desc.MediaType) || IsKnownConfig(desc.MediaType) {
|
|
||||||
// childless data types.
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
log.G(ctx).Warnf("encountered unknown type %v; children may not be fetched", desc.MediaType)
|
|
||||||
}
|
|
||||||
|
|
||||||
return descs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RootFS returns the unpacked diffids that make up and images rootfs.
|
|
||||||
//
|
|
||||||
// These are used to verify that a set of layers unpacked to the expected
|
|
||||||
// values.
|
|
||||||
func RootFS(ctx context.Context, provider content.Provider, configDesc ocispec.Descriptor) ([]digest.Digest, error) {
|
|
||||||
p, err := content.ReadBlob(ctx, provider, configDesc)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var config ocispec.Image
|
|
||||||
if err := json.Unmarshal(p, &config); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return config.RootFS.DiffIDs, nil
|
|
||||||
}
|
|
|
@ -1,37 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/content"
|
|
||||||
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Importer is the interface for image importer.
|
|
||||||
type Importer interface {
|
|
||||||
// Import imports an image from a tar stream.
|
|
||||||
Import(ctx context.Context, store content.Store, reader io.Reader) (ocispec.Descriptor, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exporter is the interface for image exporter.
|
|
||||||
type Exporter interface {
|
|
||||||
// Export exports an image to a tar stream.
|
|
||||||
Export(ctx context.Context, store content.Provider, desc ocispec.Descriptor, writer io.Writer) error
|
|
||||||
}
|
|
|
@ -1,126 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/errdefs"
|
|
||||||
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
)
|
|
||||||
|
|
||||||
// mediatype definitions for image components handled in containerd.
|
|
||||||
//
|
|
||||||
// oci components are generally referenced directly, although we may centralize
|
|
||||||
// here for clarity.
|
|
||||||
const (
|
|
||||||
MediaTypeDockerSchema2Layer = "application/vnd.docker.image.rootfs.diff.tar"
|
|
||||||
MediaTypeDockerSchema2LayerForeign = "application/vnd.docker.image.rootfs.foreign.diff.tar"
|
|
||||||
MediaTypeDockerSchema2LayerGzip = "application/vnd.docker.image.rootfs.diff.tar.gzip"
|
|
||||||
MediaTypeDockerSchema2LayerForeignGzip = "application/vnd.docker.image.rootfs.foreign.diff.tar.gzip"
|
|
||||||
MediaTypeDockerSchema2Config = "application/vnd.docker.container.image.v1+json"
|
|
||||||
MediaTypeDockerSchema2Manifest = "application/vnd.docker.distribution.manifest.v2+json"
|
|
||||||
MediaTypeDockerSchema2ManifestList = "application/vnd.docker.distribution.manifest.list.v2+json"
|
|
||||||
// Checkpoint/Restore Media Types
|
|
||||||
MediaTypeContainerd1Checkpoint = "application/vnd.containerd.container.criu.checkpoint.criu.tar"
|
|
||||||
MediaTypeContainerd1CheckpointPreDump = "application/vnd.containerd.container.criu.checkpoint.predump.tar"
|
|
||||||
MediaTypeContainerd1Resource = "application/vnd.containerd.container.resource.tar"
|
|
||||||
MediaTypeContainerd1RW = "application/vnd.containerd.container.rw.tar"
|
|
||||||
MediaTypeContainerd1CheckpointConfig = "application/vnd.containerd.container.checkpoint.config.v1+proto"
|
|
||||||
MediaTypeContainerd1CheckpointOptions = "application/vnd.containerd.container.checkpoint.options.v1+proto"
|
|
||||||
MediaTypeContainerd1CheckpointRuntimeName = "application/vnd.containerd.container.checkpoint.runtime.name"
|
|
||||||
MediaTypeContainerd1CheckpointRuntimeOptions = "application/vnd.containerd.container.checkpoint.runtime.options+proto"
|
|
||||||
// Legacy Docker schema1 manifest
|
|
||||||
MediaTypeDockerSchema1Manifest = "application/vnd.docker.distribution.manifest.v1+prettyjws"
|
|
||||||
)
|
|
||||||
|
|
||||||
// DiffCompression returns the compression as defined by the layer diff media
|
|
||||||
// type. For Docker media types without compression, "unknown" is returned to
|
|
||||||
// indicate that the media type may be compressed. If the media type is not
|
|
||||||
// recognized as a layer diff, then it returns errdefs.ErrNotImplemented
|
|
||||||
func DiffCompression(ctx context.Context, mediaType string) (string, error) {
|
|
||||||
base, ext := parseMediaTypes(mediaType)
|
|
||||||
switch base {
|
|
||||||
case MediaTypeDockerSchema2Layer, MediaTypeDockerSchema2LayerForeign:
|
|
||||||
if len(ext) > 0 {
|
|
||||||
// Type is wrapped
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
// These media types may have been compressed but failed to
|
|
||||||
// use the correct media type. The decompression function
|
|
||||||
// should detect and handle this case.
|
|
||||||
return "unknown", nil
|
|
||||||
case MediaTypeDockerSchema2LayerGzip, MediaTypeDockerSchema2LayerForeignGzip:
|
|
||||||
if len(ext) > 0 {
|
|
||||||
// Type is wrapped
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
return "gzip", nil
|
|
||||||
case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable:
|
|
||||||
if len(ext) > 0 {
|
|
||||||
switch ext[len(ext)-1] {
|
|
||||||
case "gzip":
|
|
||||||
return "gzip", nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "", nil
|
|
||||||
default:
|
|
||||||
return "", errdefs.ErrNotImplemented
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseMediaTypes splits the media type into the base type and
|
|
||||||
// an array of sorted extensions
|
|
||||||
func parseMediaTypes(mt string) (string, []string) {
|
|
||||||
if mt == "" {
|
|
||||||
return "", []string{}
|
|
||||||
}
|
|
||||||
|
|
||||||
s := strings.Split(mt, "+")
|
|
||||||
ext := s[1:]
|
|
||||||
sort.Strings(ext)
|
|
||||||
|
|
||||||
return s[0], ext
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsLayerTypes returns true if the media type is a layer
|
|
||||||
func IsLayerType(mt string) bool {
|
|
||||||
if strings.HasPrefix(mt, "application/vnd.oci.image.layer.") {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse Docker media types, strip off any + suffixes first
|
|
||||||
base, _ := parseMediaTypes(mt)
|
|
||||||
switch base {
|
|
||||||
case MediaTypeDockerSchema2Layer, MediaTypeDockerSchema2LayerGzip,
|
|
||||||
MediaTypeDockerSchema2LayerForeign, MediaTypeDockerSchema2LayerForeignGzip:
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsKnownConfig returns true if the media type is a known config type
|
|
||||||
func IsKnownConfig(mt string) bool {
|
|
||||||
switch mt {
|
|
||||||
case MediaTypeDockerSchema2Config, ocispec.MediaTypeImageConfig,
|
|
||||||
MediaTypeContainerd1Checkpoint, MediaTypeContainerd1CheckpointConfig:
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
|
@ -1,53 +0,0 @@
|
||||||
// +build !windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"path/filepath"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Lookup returns the mount info corresponds to the path.
|
|
||||||
func Lookup(dir string) (Info, error) {
|
|
||||||
dir = filepath.Clean(dir)
|
|
||||||
|
|
||||||
mounts, err := Self()
|
|
||||||
if err != nil {
|
|
||||||
return Info{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort descending order by Info.Mountpoint
|
|
||||||
sort.SliceStable(mounts, func(i, j int) bool {
|
|
||||||
return mounts[j].Mountpoint < mounts[i].Mountpoint
|
|
||||||
})
|
|
||||||
for _, m := range mounts {
|
|
||||||
// Note that m.{Major, Minor} are generally unreliable for our purpose here
|
|
||||||
// https://www.spinics.net/lists/linux-btrfs/msg58908.html
|
|
||||||
// Note that device number is not checked here, because for overlayfs files
|
|
||||||
// may have different device number with the mountpoint.
|
|
||||||
if strings.HasPrefix(dir, m.Mountpoint) {
|
|
||||||
return m, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Info{}, errors.Errorf("failed to find the mount info for %q", dir)
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
// +build windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"runtime"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Lookup returns the mount info corresponds to the path.
|
|
||||||
func Lookup(dir string) (Info, error) {
|
|
||||||
return Info{}, fmt.Errorf("mount.Lookup is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
|
|
||||||
}
|
|
|
@ -1,40 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
// Mount is the lingua franca of containerd. A mount represents a
|
|
||||||
// serialized mount syscall. Components either emit or consume mounts.
|
|
||||||
type Mount struct {
|
|
||||||
// Type specifies the host-specific of the mount.
|
|
||||||
Type string
|
|
||||||
// Source specifies where to mount from. Depending on the host system, this
|
|
||||||
// can be a source path or device.
|
|
||||||
Source string
|
|
||||||
// Options contains zero or more fstab-style mount options. Typically,
|
|
||||||
// these are platform specific.
|
|
||||||
Options []string
|
|
||||||
}
|
|
||||||
|
|
||||||
// All mounts all the provided mounts to the provided target
|
|
||||||
func All(mounts []Mount, target string) error {
|
|
||||||
for _, m := range mounts {
|
|
||||||
if err := m.Mount(target); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
|
@ -1,319 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/sys"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"golang.org/x/sys/unix"
|
|
||||||
)
|
|
||||||
|
|
||||||
var pagesize = 4096
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
pagesize = os.Getpagesize()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mount to the provided target path
|
|
||||||
func (m *Mount) Mount(target string) error {
|
|
||||||
var (
|
|
||||||
chdir string
|
|
||||||
options = m.Options
|
|
||||||
)
|
|
||||||
|
|
||||||
// avoid hitting one page limit of mount argument buffer
|
|
||||||
//
|
|
||||||
// NOTE: 512 is a buffer during pagesize check.
|
|
||||||
if m.Type == "overlay" && optionsSize(options) >= pagesize-512 {
|
|
||||||
chdir, options = compactLowerdirOption(options)
|
|
||||||
}
|
|
||||||
|
|
||||||
flags, data := parseMountOptions(options)
|
|
||||||
if len(data) > pagesize {
|
|
||||||
return errors.Errorf("mount options is too long")
|
|
||||||
}
|
|
||||||
|
|
||||||
// propagation types.
|
|
||||||
const ptypes = unix.MS_SHARED | unix.MS_PRIVATE | unix.MS_SLAVE | unix.MS_UNBINDABLE
|
|
||||||
|
|
||||||
// Ensure propagation type change flags aren't included in other calls.
|
|
||||||
oflags := flags &^ ptypes
|
|
||||||
|
|
||||||
// In the case of remounting with changed data (data != ""), need to call mount (moby/moby#34077).
|
|
||||||
if flags&unix.MS_REMOUNT == 0 || data != "" {
|
|
||||||
// Initial call applying all non-propagation flags for mount
|
|
||||||
// or remount with changed data
|
|
||||||
if err := mountAt(chdir, m.Source, target, m.Type, uintptr(oflags), data); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if flags&ptypes != 0 {
|
|
||||||
// Change the propagation type.
|
|
||||||
const pflags = ptypes | unix.MS_REC | unix.MS_SILENT
|
|
||||||
if err := unix.Mount("", target, "", uintptr(flags&pflags), ""); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const broflags = unix.MS_BIND | unix.MS_RDONLY
|
|
||||||
if oflags&broflags == broflags {
|
|
||||||
// Remount the bind to apply read only.
|
|
||||||
return unix.Mount("", target, "", uintptr(oflags|unix.MS_REMOUNT), "")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unmount the provided mount path with the flags
|
|
||||||
func Unmount(target string, flags int) error {
|
|
||||||
if err := unmount(target, flags); err != nil && err != unix.EINVAL {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func unmount(target string, flags int) error {
|
|
||||||
for i := 0; i < 50; i++ {
|
|
||||||
if err := unix.Unmount(target, flags); err != nil {
|
|
||||||
switch err {
|
|
||||||
case unix.EBUSY:
|
|
||||||
time.Sleep(50 * time.Millisecond)
|
|
||||||
continue
|
|
||||||
default:
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return errors.Wrapf(unix.EBUSY, "failed to unmount target %s", target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmountAll repeatedly unmounts the given mount point until there
|
|
||||||
// are no mounts remaining (EINVAL is returned by mount), which is
|
|
||||||
// useful for undoing a stack of mounts on the same mount point.
|
|
||||||
// UnmountAll all is noop when the first argument is an empty string.
|
|
||||||
// This is done when the containerd client did not specify any rootfs
|
|
||||||
// mounts (e.g. because the rootfs is managed outside containerd)
|
|
||||||
// UnmountAll is noop when the mount path does not exist.
|
|
||||||
func UnmountAll(mount string, flags int) error {
|
|
||||||
if mount == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if _, err := os.Stat(mount); os.IsNotExist(err) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
for {
|
|
||||||
if err := unmount(mount, flags); err != nil {
|
|
||||||
// EINVAL is returned if the target is not a
|
|
||||||
// mount point, indicating that we are
|
|
||||||
// done. It can also indicate a few other
|
|
||||||
// things (such as invalid flags) which we
|
|
||||||
// unfortunately end up squelching here too.
|
|
||||||
if err == unix.EINVAL {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseMountOptions takes fstab style mount options and parses them for
|
|
||||||
// use with a standard mount() syscall
|
|
||||||
func parseMountOptions(options []string) (int, string) {
|
|
||||||
var (
|
|
||||||
flag int
|
|
||||||
data []string
|
|
||||||
)
|
|
||||||
flags := map[string]struct {
|
|
||||||
clear bool
|
|
||||||
flag int
|
|
||||||
}{
|
|
||||||
"async": {true, unix.MS_SYNCHRONOUS},
|
|
||||||
"atime": {true, unix.MS_NOATIME},
|
|
||||||
"bind": {false, unix.MS_BIND},
|
|
||||||
"defaults": {false, 0},
|
|
||||||
"dev": {true, unix.MS_NODEV},
|
|
||||||
"diratime": {true, unix.MS_NODIRATIME},
|
|
||||||
"dirsync": {false, unix.MS_DIRSYNC},
|
|
||||||
"exec": {true, unix.MS_NOEXEC},
|
|
||||||
"mand": {false, unix.MS_MANDLOCK},
|
|
||||||
"noatime": {false, unix.MS_NOATIME},
|
|
||||||
"nodev": {false, unix.MS_NODEV},
|
|
||||||
"nodiratime": {false, unix.MS_NODIRATIME},
|
|
||||||
"noexec": {false, unix.MS_NOEXEC},
|
|
||||||
"nomand": {true, unix.MS_MANDLOCK},
|
|
||||||
"norelatime": {true, unix.MS_RELATIME},
|
|
||||||
"nostrictatime": {true, unix.MS_STRICTATIME},
|
|
||||||
"nosuid": {false, unix.MS_NOSUID},
|
|
||||||
"rbind": {false, unix.MS_BIND | unix.MS_REC},
|
|
||||||
"relatime": {false, unix.MS_RELATIME},
|
|
||||||
"remount": {false, unix.MS_REMOUNT},
|
|
||||||
"ro": {false, unix.MS_RDONLY},
|
|
||||||
"rw": {true, unix.MS_RDONLY},
|
|
||||||
"strictatime": {false, unix.MS_STRICTATIME},
|
|
||||||
"suid": {true, unix.MS_NOSUID},
|
|
||||||
"sync": {false, unix.MS_SYNCHRONOUS},
|
|
||||||
}
|
|
||||||
for _, o := range options {
|
|
||||||
// If the option does not exist in the flags table or the flag
|
|
||||||
// is not supported on the platform,
|
|
||||||
// then it is a data value for a specific fs type
|
|
||||||
if f, exists := flags[o]; exists && f.flag != 0 {
|
|
||||||
if f.clear {
|
|
||||||
flag &^= f.flag
|
|
||||||
} else {
|
|
||||||
flag |= f.flag
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
data = append(data, o)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return flag, strings.Join(data, ",")
|
|
||||||
}
|
|
||||||
|
|
||||||
// compactLowerdirOption updates overlay lowdir option and returns the common
|
|
||||||
// dir among all the lowdirs.
|
|
||||||
func compactLowerdirOption(opts []string) (string, []string) {
|
|
||||||
idx, dirs := findOverlayLowerdirs(opts)
|
|
||||||
if idx == -1 || len(dirs) == 1 {
|
|
||||||
// no need to compact if there is only one lowerdir
|
|
||||||
return "", opts
|
|
||||||
}
|
|
||||||
|
|
||||||
// find out common dir
|
|
||||||
commondir := longestCommonPrefix(dirs)
|
|
||||||
if commondir == "" {
|
|
||||||
return "", opts
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: the snapshot id is based on digits.
|
|
||||||
// in order to avoid to get snapshots/x, should be back to parent dir.
|
|
||||||
// however, there is assumption that the common dir is ${root}/io.containerd.v1.overlayfs/snapshots.
|
|
||||||
commondir = path.Dir(commondir)
|
|
||||||
if commondir == "/" {
|
|
||||||
return "", opts
|
|
||||||
}
|
|
||||||
commondir = commondir + "/"
|
|
||||||
|
|
||||||
newdirs := make([]string, 0, len(dirs))
|
|
||||||
for _, dir := range dirs {
|
|
||||||
newdirs = append(newdirs, dir[len(commondir):])
|
|
||||||
}
|
|
||||||
|
|
||||||
newopts := copyOptions(opts)
|
|
||||||
newopts = append(newopts[:idx], newopts[idx+1:]...)
|
|
||||||
newopts = append(newopts, fmt.Sprintf("lowerdir=%s", strings.Join(newdirs, ":")))
|
|
||||||
return commondir, newopts
|
|
||||||
}
|
|
||||||
|
|
||||||
// findOverlayLowerdirs returns the index of lowerdir in mount's options and
|
|
||||||
// all the lowerdir target.
|
|
||||||
func findOverlayLowerdirs(opts []string) (int, []string) {
|
|
||||||
var (
|
|
||||||
idx = -1
|
|
||||||
prefix = "lowerdir="
|
|
||||||
)
|
|
||||||
|
|
||||||
for i, opt := range opts {
|
|
||||||
if strings.HasPrefix(opt, prefix) {
|
|
||||||
idx = i
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if idx == -1 {
|
|
||||||
return -1, nil
|
|
||||||
}
|
|
||||||
return idx, strings.Split(opts[idx][len(prefix):], ":")
|
|
||||||
}
|
|
||||||
|
|
||||||
// longestCommonPrefix finds the longest common prefix in the string slice.
|
|
||||||
func longestCommonPrefix(strs []string) string {
|
|
||||||
if len(strs) == 0 {
|
|
||||||
return ""
|
|
||||||
} else if len(strs) == 1 {
|
|
||||||
return strs[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
// find out the min/max value by alphabetical order
|
|
||||||
min, max := strs[0], strs[0]
|
|
||||||
for _, str := range strs[1:] {
|
|
||||||
if min > str {
|
|
||||||
min = str
|
|
||||||
}
|
|
||||||
if max < str {
|
|
||||||
max = str
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// find out the common part between min and max
|
|
||||||
for i := 0; i < len(min) && i < len(max); i++ {
|
|
||||||
if min[i] != max[i] {
|
|
||||||
return min[:i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return min
|
|
||||||
}
|
|
||||||
|
|
||||||
// copyOptions copies the options.
|
|
||||||
func copyOptions(opts []string) []string {
|
|
||||||
if len(opts) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
acopy := make([]string, len(opts))
|
|
||||||
copy(acopy, opts)
|
|
||||||
return acopy
|
|
||||||
}
|
|
||||||
|
|
||||||
// optionsSize returns the byte size of options of mount.
|
|
||||||
func optionsSize(opts []string) int {
|
|
||||||
size := 0
|
|
||||||
for _, opt := range opts {
|
|
||||||
size += len(opt)
|
|
||||||
}
|
|
||||||
return size
|
|
||||||
}
|
|
||||||
|
|
||||||
func mountAt(chdir string, source, target, fstype string, flags uintptr, data string) error {
|
|
||||||
if chdir == "" {
|
|
||||||
return unix.Mount(source, target, fstype, flags, data)
|
|
||||||
}
|
|
||||||
|
|
||||||
f, err := os.Open(chdir)
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "failed to mountat")
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
fs, err := f.Stat()
|
|
||||||
if err != nil {
|
|
||||||
return errors.Wrap(err, "failed to mountat")
|
|
||||||
}
|
|
||||||
|
|
||||||
if !fs.IsDir() {
|
|
||||||
return errors.Wrap(errors.Errorf("%s is not dir", chdir), "failed to mountat")
|
|
||||||
}
|
|
||||||
return errors.Wrap(sys.FMountat(f.Fd(), source, target, fstype, flags, data), "failed to mountat")
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
// +build darwin freebsd openbsd
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import "github.com/pkg/errors"
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrNotImplementOnUnix is returned for methods that are not implemented
|
|
||||||
ErrNotImplementOnUnix = errors.New("not implemented under unix")
|
|
||||||
)
|
|
||||||
|
|
||||||
// Mount is not implemented on this platform
|
|
||||||
func (m *Mount) Mount(target string) error {
|
|
||||||
return ErrNotImplementOnUnix
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unmount is not implemented on this platform
|
|
||||||
func Unmount(mount string, flags int) error {
|
|
||||||
return ErrNotImplementOnUnix
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmountAll is not implemented on this platform
|
|
||||||
func UnmountAll(mount string, flags int) error {
|
|
||||||
return ErrNotImplementOnUnix
|
|
||||||
}
|
|
|
@ -1,105 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/Microsoft/hcsshim"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrNotImplementOnWindows is returned when an action is not implemented for windows
|
|
||||||
ErrNotImplementOnWindows = errors.New("not implemented under windows")
|
|
||||||
)
|
|
||||||
|
|
||||||
// Mount to the provided target
|
|
||||||
func (m *Mount) Mount(target string) error {
|
|
||||||
if m.Type != "windows-layer" {
|
|
||||||
return errors.Errorf("invalid windows mount type: '%s'", m.Type)
|
|
||||||
}
|
|
||||||
|
|
||||||
home, layerID := filepath.Split(m.Source)
|
|
||||||
|
|
||||||
parentLayerPaths, err := m.GetParentPaths()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var di = hcsshim.DriverInfo{
|
|
||||||
HomeDir: home,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = hcsshim.ActivateLayer(di, layerID); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to activate layer %s", m.Source)
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if err != nil {
|
|
||||||
hcsshim.DeactivateLayer(di, layerID)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
if err = hcsshim.PrepareLayer(di, layerID, parentLayerPaths); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to prepare layer %s", m.Source)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParentLayerPathsFlag is the options flag used to represent the JSON encoded
|
|
||||||
// list of parent layers required to use the layer
|
|
||||||
const ParentLayerPathsFlag = "parentLayerPaths="
|
|
||||||
|
|
||||||
// GetParentPaths of the mount
|
|
||||||
func (m *Mount) GetParentPaths() ([]string, error) {
|
|
||||||
var parentLayerPaths []string
|
|
||||||
for _, option := range m.Options {
|
|
||||||
if strings.HasPrefix(option, ParentLayerPathsFlag) {
|
|
||||||
err := json.Unmarshal([]byte(option[len(ParentLayerPathsFlag):]), &parentLayerPaths)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrap(err, "failed to unmarshal parent layer paths from mount")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return parentLayerPaths, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unmount the mount at the provided path
|
|
||||||
func Unmount(mount string, flags int) error {
|
|
||||||
var (
|
|
||||||
home, layerID = filepath.Split(mount)
|
|
||||||
di = hcsshim.DriverInfo{
|
|
||||||
HomeDir: home,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
if err := hcsshim.UnprepareLayer(di, layerID); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to unprepare layer %s", mount)
|
|
||||||
}
|
|
||||||
if err := hcsshim.DeactivateLayer(di, layerID); err != nil {
|
|
||||||
return errors.Wrapf(err, "failed to deactivate layer %s", mount)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmountAll unmounts from the provided path
|
|
||||||
func UnmountAll(mount string, flags int) error {
|
|
||||||
return Unmount(mount, flags)
|
|
||||||
}
|
|
|
@ -1,56 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
// Info reveals information about a particular mounted filesystem. This
|
|
||||||
// struct is populated from the content in the /proc/<pid>/mountinfo file.
|
|
||||||
type Info struct {
|
|
||||||
// ID is a unique identifier of the mount (may be reused after umount).
|
|
||||||
ID int
|
|
||||||
|
|
||||||
// Parent indicates the ID of the mount parent (or of self for the top of the
|
|
||||||
// mount tree).
|
|
||||||
Parent int
|
|
||||||
|
|
||||||
// Major indicates one half of the device ID which identifies the device class.
|
|
||||||
Major int
|
|
||||||
|
|
||||||
// Minor indicates one half of the device ID which identifies a specific
|
|
||||||
// instance of device.
|
|
||||||
Minor int
|
|
||||||
|
|
||||||
// Root of the mount within the filesystem.
|
|
||||||
Root string
|
|
||||||
|
|
||||||
// Mountpoint indicates the mount point relative to the process's root.
|
|
||||||
Mountpoint string
|
|
||||||
|
|
||||||
// Options represents mount-specific options.
|
|
||||||
Options string
|
|
||||||
|
|
||||||
// Optional represents optional fields.
|
|
||||||
Optional string
|
|
||||||
|
|
||||||
// FSType indicates the type of filesystem, such as EXT3.
|
|
||||||
FSType string
|
|
||||||
|
|
||||||
// Source indicates filesystem specific information or "none".
|
|
||||||
Source string
|
|
||||||
|
|
||||||
// VFSOptions represents per super block options.
|
|
||||||
VFSOptions string
|
|
||||||
}
|
|
|
@ -1,63 +0,0 @@
|
||||||
// +build freebsd openbsd
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
/*
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <sys/ucred.h>
|
|
||||||
#include <sys/mount.h>
|
|
||||||
*/
|
|
||||||
import "C"
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Self retrieves a list of mounts for the current running process.
|
|
||||||
func Self() ([]Info, error) {
|
|
||||||
var rawEntries *C.struct_statfs
|
|
||||||
|
|
||||||
count := int(C.getmntinfo(&rawEntries, C.MNT_WAIT))
|
|
||||||
if count == 0 {
|
|
||||||
return nil, fmt.Errorf("Failed to call getmntinfo")
|
|
||||||
}
|
|
||||||
|
|
||||||
var entries []C.struct_statfs
|
|
||||||
header := (*reflect.SliceHeader)(unsafe.Pointer(&entries))
|
|
||||||
header.Cap = count
|
|
||||||
header.Len = count
|
|
||||||
header.Data = uintptr(unsafe.Pointer(rawEntries))
|
|
||||||
|
|
||||||
var out []Info
|
|
||||||
for _, entry := range entries {
|
|
||||||
var mountinfo Info
|
|
||||||
mountinfo.Mountpoint = C.GoString(&entry.f_mntonname[0])
|
|
||||||
mountinfo.Source = C.GoString(&entry.f_mntfromname[0])
|
|
||||||
mountinfo.FSType = C.GoString(&entry.f_fstypename[0])
|
|
||||||
out = append(out, mountinfo)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// PID collects the mounts for a specific process ID.
|
|
||||||
func PID(pid int) ([]Info, error) {
|
|
||||||
return nil, fmt.Errorf("mountinfo.PID is not implemented on freebsd")
|
|
||||||
}
|
|
|
@ -1,145 +0,0 @@
|
||||||
// +build linux
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Self retrieves a list of mounts for the current running process.
|
|
||||||
func Self() ([]Info, error) {
|
|
||||||
f, err := os.Open("/proc/self/mountinfo")
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
return parseInfoFile(f)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseInfoFile(r io.Reader) ([]Info, error) {
|
|
||||||
s := bufio.NewScanner(r)
|
|
||||||
out := []Info{}
|
|
||||||
var err error
|
|
||||||
for s.Scan() {
|
|
||||||
if err = s.Err(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
See http://man7.org/linux/man-pages/man5/proc.5.html
|
|
||||||
|
|
||||||
36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
|
|
||||||
(1)(2)(3) (4) (5) (6) (7) (8) (9) (10) (11)
|
|
||||||
(1) mount ID: unique identifier of the mount (may be reused after umount)
|
|
||||||
(2) parent ID: ID of parent (or of self for the top of the mount tree)
|
|
||||||
(3) major:minor: value of st_dev for files on filesystem
|
|
||||||
(4) root: root of the mount within the filesystem
|
|
||||||
(5) mount point: mount point relative to the process's root
|
|
||||||
(6) mount options: per mount options
|
|
||||||
(7) optional fields: zero or more fields of the form "tag[:value]"
|
|
||||||
(8) separator: marks the end of the optional fields
|
|
||||||
(9) filesystem type: name of filesystem of the form "type[.subtype]"
|
|
||||||
(10) mount source: filesystem specific information or "none"
|
|
||||||
(11) super options: per super block options
|
|
||||||
*/
|
|
||||||
|
|
||||||
text := s.Text()
|
|
||||||
fields := strings.Split(text, " ")
|
|
||||||
numFields := len(fields)
|
|
||||||
if numFields < 10 {
|
|
||||||
// should be at least 10 fields
|
|
||||||
return nil, errors.Errorf("parsing '%s' failed: not enough fields (%d)", text, numFields)
|
|
||||||
}
|
|
||||||
p := Info{}
|
|
||||||
// ignore any numbers parsing errors, as there should not be any
|
|
||||||
p.ID, _ = strconv.Atoi(fields[0])
|
|
||||||
p.Parent, _ = strconv.Atoi(fields[1])
|
|
||||||
mm := strings.Split(fields[2], ":")
|
|
||||||
if len(mm) != 2 {
|
|
||||||
return nil, errors.Errorf("parsing '%s' failed: unexpected minor:major pair %s", text, mm)
|
|
||||||
}
|
|
||||||
p.Major, _ = strconv.Atoi(mm[0])
|
|
||||||
p.Minor, _ = strconv.Atoi(mm[1])
|
|
||||||
|
|
||||||
p.Root, err = strconv.Unquote(`"` + fields[3] + `"`)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "parsing '%s' failed: unable to unquote root field", fields[3])
|
|
||||||
}
|
|
||||||
p.Mountpoint, err = strconv.Unquote(`"` + fields[4] + `"`)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "parsing '%s' failed: unable to unquote mount point field", fields[4])
|
|
||||||
}
|
|
||||||
p.Options = fields[5]
|
|
||||||
|
|
||||||
// one or more optional fields, when a separator (-)
|
|
||||||
i := 6
|
|
||||||
for ; i < numFields && fields[i] != "-"; i++ {
|
|
||||||
switch i {
|
|
||||||
case 6:
|
|
||||||
p.Optional = fields[6]
|
|
||||||
default:
|
|
||||||
/* NOTE there might be more optional fields before the separator
|
|
||||||
such as fields[7]...fields[N] (where N < separatorIndex),
|
|
||||||
although as of Linux kernel 4.15 the only known ones are
|
|
||||||
mount propagation flags in fields[6]. The correct
|
|
||||||
behavior is to ignore any unknown optional fields.
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if i == numFields {
|
|
||||||
return nil, errors.Errorf("parsing '%s' failed: missing separator ('-')", text)
|
|
||||||
}
|
|
||||||
// There should be 3 fields after the separator...
|
|
||||||
if i+4 > numFields {
|
|
||||||
return nil, errors.Errorf("parsing '%s' failed: not enough fields after a separator", text)
|
|
||||||
}
|
|
||||||
// ... but in Linux <= 3.9 mounting a cifs with spaces in a share name
|
|
||||||
// (like "//serv/My Documents") _may_ end up having a space in the last field
|
|
||||||
// of mountinfo (like "unc=//serv/My Documents"). Since kernel 3.10-rc1, cifs
|
|
||||||
// option unc= is ignored, so a space should not appear. In here we ignore
|
|
||||||
// those "extra" fields caused by extra spaces.
|
|
||||||
p.FSType = fields[i+1]
|
|
||||||
p.Source = fields[i+2]
|
|
||||||
p.VFSOptions = fields[i+3]
|
|
||||||
|
|
||||||
out = append(out, p)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// PID collects the mounts for a specific process ID. If the process
|
|
||||||
// ID is unknown, it is better to use `Self` which will inspect
|
|
||||||
// "/proc/self/mountinfo" instead.
|
|
||||||
func PID(pid int) ([]Info, error) {
|
|
||||||
f, err := os.Open(fmt.Sprintf("/proc/%d/mountinfo", pid))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
return parseInfoFile(f)
|
|
||||||
}
|
|
|
@ -1,34 +0,0 @@
|
||||||
// +build !linux,!freebsd,!solaris,!openbsd freebsd,!cgo solaris,!cgo openbsd,!cgo
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"runtime"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Self retrieves a list of mounts for the current running process.
|
|
||||||
func Self() ([]Info, error) {
|
|
||||||
return nil, fmt.Errorf("mountinfo.Self is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PID collects the mounts for a specific process ID.
|
|
||||||
func PID(pid int) ([]Info, error) {
|
|
||||||
return nil, fmt.Errorf("mountinfo.PID is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
|
|
||||||
}
|
|
|
@ -1,73 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/log"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
var tempMountLocation = getTempDir()
|
|
||||||
|
|
||||||
// WithTempMount mounts the provided mounts to a temp dir, and pass the temp dir to f.
|
|
||||||
// The mounts are valid during the call to the f.
|
|
||||||
// Finally we will unmount and remove the temp dir regardless of the result of f.
|
|
||||||
func WithTempMount(ctx context.Context, mounts []Mount, f func(root string) error) (err error) {
|
|
||||||
root, uerr := ioutil.TempDir(tempMountLocation, "containerd-mount")
|
|
||||||
if uerr != nil {
|
|
||||||
return errors.Wrapf(uerr, "failed to create temp dir")
|
|
||||||
}
|
|
||||||
// We use Remove here instead of RemoveAll.
|
|
||||||
// The RemoveAll will delete the temp dir and all children it contains.
|
|
||||||
// When the Unmount fails, RemoveAll will incorrectly delete data from
|
|
||||||
// the mounted dir. However, if we use Remove, even though we won't
|
|
||||||
// successfully delete the temp dir and it may leak, we won't loss data
|
|
||||||
// from the mounted dir.
|
|
||||||
// For details, please refer to #1868 #1785.
|
|
||||||
defer func() {
|
|
||||||
if uerr = os.Remove(root); uerr != nil {
|
|
||||||
log.G(ctx).WithError(uerr).WithField("dir", root).Errorf("failed to remove mount temp dir")
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
// We should do defer first, if not we will not do Unmount when only a part of Mounts are failed.
|
|
||||||
defer func() {
|
|
||||||
if uerr = UnmountAll(root, 0); uerr != nil {
|
|
||||||
uerr = errors.Wrapf(uerr, "failed to unmount %s", root)
|
|
||||||
if err == nil {
|
|
||||||
err = uerr
|
|
||||||
} else {
|
|
||||||
err = errors.Wrap(err, uerr.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
if uerr = All(mounts, root); uerr != nil {
|
|
||||||
return errors.Wrapf(uerr, "failed to mount %s", root)
|
|
||||||
}
|
|
||||||
return errors.Wrapf(f(root), "mount callback failed on %s", root)
|
|
||||||
}
|
|
||||||
|
|
||||||
func getTempDir() string {
|
|
||||||
if xdg := os.Getenv("XDG_RUNTIME_DIR"); xdg != "" {
|
|
||||||
return xdg
|
|
||||||
}
|
|
||||||
return os.TempDir()
|
|
||||||
}
|
|
|
@ -1,64 +0,0 @@
|
||||||
// +build !windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// SetTempMountLocation sets the temporary mount location
|
|
||||||
func SetTempMountLocation(root string) error {
|
|
||||||
root, err := filepath.Abs(root)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := os.MkdirAll(root, 0700); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
tempMountLocation = root
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// CleanupTempMounts all temp mounts and remove the directories
|
|
||||||
func CleanupTempMounts(flags int) (warnings []error, err error) {
|
|
||||||
mounts, err := Self()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var toUnmount []string
|
|
||||||
for _, m := range mounts {
|
|
||||||
if strings.HasPrefix(m.Mountpoint, tempMountLocation) {
|
|
||||||
toUnmount = append(toUnmount, m.Mountpoint)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sort.Sort(sort.Reverse(sort.StringSlice(toUnmount)))
|
|
||||||
for _, path := range toUnmount {
|
|
||||||
if err := UnmountAll(path, flags); err != nil {
|
|
||||||
warnings = append(warnings, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if err := os.Remove(path); err != nil {
|
|
||||||
warnings = append(warnings, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return warnings, nil
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
// +build windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package mount
|
|
||||||
|
|
||||||
// SetTempMountLocation sets the temporary mount location
|
|
||||||
func SetTempMountLocation(root string) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// CleanupTempMounts all temp mounts and remove the directories
|
|
||||||
func CleanupTempMounts(flags int) ([]error, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
|
@ -1,77 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package namespaces
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/errdefs"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
// NamespaceEnvVar is the environment variable key name
|
|
||||||
NamespaceEnvVar = "CONTAINERD_NAMESPACE"
|
|
||||||
// Default is the name of the default namespace
|
|
||||||
Default = "default"
|
|
||||||
)
|
|
||||||
|
|
||||||
type namespaceKey struct{}
|
|
||||||
|
|
||||||
// WithNamespace sets a given namespace on the context
|
|
||||||
func WithNamespace(ctx context.Context, namespace string) context.Context {
|
|
||||||
ctx = context.WithValue(ctx, namespaceKey{}, namespace) // set our key for namespace
|
|
||||||
// also store on the grpc and ttrpc headers so it gets picked up by any clients that
|
|
||||||
// are using this.
|
|
||||||
return withTTRPCNamespaceHeader(withGRPCNamespaceHeader(ctx, namespace), namespace)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NamespaceFromEnv uses the namespace defined in CONTAINERD_NAMESPACE or
|
|
||||||
// default
|
|
||||||
func NamespaceFromEnv(ctx context.Context) context.Context {
|
|
||||||
namespace := os.Getenv(NamespaceEnvVar)
|
|
||||||
if namespace == "" {
|
|
||||||
namespace = Default
|
|
||||||
}
|
|
||||||
return WithNamespace(ctx, namespace)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Namespace returns the namespace from the context.
|
|
||||||
//
|
|
||||||
// The namespace is not guaranteed to be valid.
|
|
||||||
func Namespace(ctx context.Context) (string, bool) {
|
|
||||||
namespace, ok := ctx.Value(namespaceKey{}).(string)
|
|
||||||
if !ok {
|
|
||||||
if namespace, ok = fromGRPCHeader(ctx); !ok {
|
|
||||||
return fromTTRPCHeader(ctx)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return namespace, ok
|
|
||||||
}
|
|
||||||
|
|
||||||
// NamespaceRequired returns the valid namespace from the context or an error.
|
|
||||||
func NamespaceRequired(ctx context.Context) (string, error) {
|
|
||||||
namespace, ok := Namespace(ctx)
|
|
||||||
if !ok || namespace == "" {
|
|
||||||
return "", errors.Wrapf(errdefs.ErrFailedPrecondition, "namespace is required")
|
|
||||||
}
|
|
||||||
if err := Validate(namespace); err != nil {
|
|
||||||
return "", errors.Wrap(err, "namespace validation")
|
|
||||||
}
|
|
||||||
return namespace, nil
|
|
||||||
}
|
|
|
@ -1,61 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package namespaces
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"google.golang.org/grpc/metadata"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
// GRPCHeader defines the header name for specifying a containerd namespace.
|
|
||||||
GRPCHeader = "containerd-namespace"
|
|
||||||
)
|
|
||||||
|
|
||||||
// NOTE(stevvooe): We can stub this file out if we don't want a grpc dependency here.
|
|
||||||
|
|
||||||
func withGRPCNamespaceHeader(ctx context.Context, namespace string) context.Context {
|
|
||||||
// also store on the grpc headers so it gets picked up by any clients that
|
|
||||||
// are using this.
|
|
||||||
nsheader := metadata.Pairs(GRPCHeader, namespace)
|
|
||||||
md, ok := metadata.FromOutgoingContext(ctx) // merge with outgoing context.
|
|
||||||
if !ok {
|
|
||||||
md = nsheader
|
|
||||||
} else {
|
|
||||||
// order ensures the latest is first in this list.
|
|
||||||
md = metadata.Join(nsheader, md)
|
|
||||||
}
|
|
||||||
|
|
||||||
return metadata.NewOutgoingContext(ctx, md)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fromGRPCHeader(ctx context.Context) (string, bool) {
|
|
||||||
// try to extract for use in grpc servers.
|
|
||||||
md, ok := metadata.FromIncomingContext(ctx)
|
|
||||||
if !ok {
|
|
||||||
// TODO(stevvooe): Check outgoing context?
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
|
|
||||||
values := md[GRPCHeader]
|
|
||||||
if len(values) == 0 {
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
|
|
||||||
return values[0], true
|
|
||||||
}
|
|
|
@ -1,46 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package namespaces
|
|
||||||
|
|
||||||
import "context"
|
|
||||||
|
|
||||||
// Store provides introspection about namespaces.
|
|
||||||
//
|
|
||||||
// Note that these are slightly different than other objects, which are record
|
|
||||||
// oriented. A namespace is really just a name and a set of labels. Objects
|
|
||||||
// that belong to a namespace are returned when the namespace is assigned to a
|
|
||||||
// given context.
|
|
||||||
//
|
|
||||||
//
|
|
||||||
type Store interface {
|
|
||||||
Create(ctx context.Context, namespace string, labels map[string]string) error
|
|
||||||
Labels(ctx context.Context, namespace string) (map[string]string, error)
|
|
||||||
SetLabel(ctx context.Context, namespace, key, value string) error
|
|
||||||
List(ctx context.Context) ([]string, error)
|
|
||||||
|
|
||||||
// Delete removes the namespace. The namespace must be empty to be deleted.
|
|
||||||
Delete(ctx context.Context, namespace string, opts ...DeleteOpts) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteInfo specifies information for the deletion of a namespace
|
|
||||||
type DeleteInfo struct {
|
|
||||||
// Name of the namespace
|
|
||||||
Name string
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteOpts allows the caller to set options for namespace deletion
|
|
||||||
type DeleteOpts func(context.Context, *DeleteInfo) error
|
|
|
@ -1,51 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package namespaces
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/containerd/ttrpc"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
// TTRPCHeader defines the header name for specifying a containerd namespace
|
|
||||||
TTRPCHeader = "containerd-namespace-ttrpc"
|
|
||||||
)
|
|
||||||
|
|
||||||
func copyMetadata(src ttrpc.MD) ttrpc.MD {
|
|
||||||
md := ttrpc.MD{}
|
|
||||||
for k, v := range src {
|
|
||||||
md[k] = append(md[k], v...)
|
|
||||||
}
|
|
||||||
return md
|
|
||||||
}
|
|
||||||
|
|
||||||
func withTTRPCNamespaceHeader(ctx context.Context, namespace string) context.Context {
|
|
||||||
md, ok := ttrpc.GetMetadata(ctx)
|
|
||||||
if !ok {
|
|
||||||
md = ttrpc.MD{}
|
|
||||||
} else {
|
|
||||||
md = copyMetadata(md)
|
|
||||||
}
|
|
||||||
md.Set(TTRPCHeader, namespace)
|
|
||||||
return ttrpc.WithMetadata(ctx, md)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fromTTRPCHeader(ctx context.Context) (string, bool) {
|
|
||||||
return ttrpc.GetMetadataValue(ctx, TTRPCHeader)
|
|
||||||
}
|
|
|
@ -1,83 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Package namespaces provides tools for working with namespaces across
|
|
||||||
// containerd.
|
|
||||||
//
|
|
||||||
// Namespaces collect resources such as containers and images, into a unique
|
|
||||||
// identifier space. This means that two applications can use the same
|
|
||||||
// identifiers and not conflict while using containerd.
|
|
||||||
//
|
|
||||||
// This package can be used to ensure that client and server functions
|
|
||||||
// correctly store the namespace on the context.
|
|
||||||
package namespaces
|
|
||||||
|
|
||||||
import (
|
|
||||||
"regexp"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/errdefs"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
maxLength = 76
|
|
||||||
alpha = `[A-Za-z]`
|
|
||||||
alphanum = `[A-Za-z0-9]+`
|
|
||||||
label = alpha + alphanum + `(:?[-]+` + alpha + alphanum + `)*`
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// namespaceRe validates that a namespace matches valid identifiers.
|
|
||||||
//
|
|
||||||
// Rules for domains, defined in RFC 1035, section 2.3.1, are used for
|
|
||||||
// namespaces.
|
|
||||||
namespaceRe = regexp.MustCompile(reAnchor(label + reGroup("[.]"+reGroup(label)) + "*"))
|
|
||||||
)
|
|
||||||
|
|
||||||
// Validate returns nil if the string s is a valid namespace.
|
|
||||||
//
|
|
||||||
// To allow such namespace identifiers to be used across various contexts
|
|
||||||
// safely, the character set has been restricted to that defined for domains in
|
|
||||||
// RFC 1035, section 2.3.1. This will make namespace identifiers safe for use
|
|
||||||
// across networks, filesystems and other media.
|
|
||||||
//
|
|
||||||
// The identifier specification departs from RFC 1035 in that it allows
|
|
||||||
// "labels" to start with number and only enforces a total length restriction
|
|
||||||
// of 76 characters.
|
|
||||||
//
|
|
||||||
// While the character set may be expanded in the future, namespace identifiers
|
|
||||||
// are guaranteed to be safely used as filesystem path components.
|
|
||||||
//
|
|
||||||
// For the most part, this doesn't need to be called directly when using the
|
|
||||||
// context-oriented functions.
|
|
||||||
func Validate(s string) error {
|
|
||||||
if len(s) > maxLength {
|
|
||||||
return errors.Wrapf(errdefs.ErrInvalidArgument, "namespace %q greater than maximum length (%d characters)", s, maxLength)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !namespaceRe.MatchString(s) {
|
|
||||||
return errors.Wrapf(errdefs.ErrInvalidArgument, "namespace %q must match %v", s, namespaceRe)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func reGroup(s string) string {
|
|
||||||
return `(?:` + s + `)`
|
|
||||||
}
|
|
||||||
|
|
||||||
func reAnchor(s string) string {
|
|
||||||
return `^` + s + `$`
|
|
||||||
}
|
|
|
@ -1,38 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package oci
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/content"
|
|
||||||
"github.com/containerd/containerd/snapshots"
|
|
||||||
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Client interface used by SpecOpt
|
|
||||||
type Client interface {
|
|
||||||
SnapshotService(snapshotterName string) snapshots.Snapshotter
|
|
||||||
}
|
|
||||||
|
|
||||||
// Image interface used by some SpecOpt to query image configuration
|
|
||||||
type Image interface {
|
|
||||||
// Config descriptor for the image.
|
|
||||||
Config(ctx context.Context) (ocispec.Descriptor, error)
|
|
||||||
// ContentStore provides a content store which contains image blob data
|
|
||||||
ContentStore() content.Store
|
|
||||||
}
|
|
|
@ -1,253 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package oci
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/namespaces"
|
|
||||||
"github.com/containerd/containerd/platforms"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/containers"
|
|
||||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
rwm = "rwm"
|
|
||||||
defaultRootfsPath = "rootfs"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
defaultUnixEnv = []string{
|
|
||||||
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
// Spec is a type alias to the OCI runtime spec to allow third part SpecOpts
|
|
||||||
// to be created without the "issues" with go vendoring and package imports
|
|
||||||
type Spec = specs.Spec
|
|
||||||
|
|
||||||
// GenerateSpec will generate a default spec from the provided image
|
|
||||||
// for use as a containerd container
|
|
||||||
func GenerateSpec(ctx context.Context, client Client, c *containers.Container, opts ...SpecOpts) (*Spec, error) {
|
|
||||||
return GenerateSpecWithPlatform(ctx, client, platforms.DefaultString(), c, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GenerateSpecWithPlatform will generate a default spec from the provided image
|
|
||||||
// for use as a containerd container in the platform requested.
|
|
||||||
func GenerateSpecWithPlatform(ctx context.Context, client Client, platform string, c *containers.Container, opts ...SpecOpts) (*Spec, error) {
|
|
||||||
var s Spec
|
|
||||||
if err := generateDefaultSpecWithPlatform(ctx, platform, c.ID, &s); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &s, ApplyOpts(ctx, client, c, &s, opts...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func generateDefaultSpecWithPlatform(ctx context.Context, platform, id string, s *Spec) error {
|
|
||||||
plat, err := platforms.Parse(platform)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if plat.OS == "windows" {
|
|
||||||
err = populateDefaultWindowsSpec(ctx, s, id)
|
|
||||||
} else {
|
|
||||||
err = populateDefaultUnixSpec(ctx, s, id)
|
|
||||||
if err == nil && runtime.GOOS == "windows" {
|
|
||||||
// To run LCOW we have a Linux and Windows section. Add an empty one now.
|
|
||||||
s.Windows = &specs.Windows{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// ApplyOpts applies the options to the given spec, injecting data from the
|
|
||||||
// context, client and container instance.
|
|
||||||
func ApplyOpts(ctx context.Context, client Client, c *containers.Container, s *Spec, opts ...SpecOpts) error {
|
|
||||||
for _, o := range opts {
|
|
||||||
if err := o(ctx, client, c, s); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultUnixCaps() []string {
|
|
||||||
return []string{
|
|
||||||
"CAP_CHOWN",
|
|
||||||
"CAP_DAC_OVERRIDE",
|
|
||||||
"CAP_FSETID",
|
|
||||||
"CAP_FOWNER",
|
|
||||||
"CAP_MKNOD",
|
|
||||||
"CAP_NET_RAW",
|
|
||||||
"CAP_SETGID",
|
|
||||||
"CAP_SETUID",
|
|
||||||
"CAP_SETFCAP",
|
|
||||||
"CAP_SETPCAP",
|
|
||||||
"CAP_NET_BIND_SERVICE",
|
|
||||||
"CAP_SYS_CHROOT",
|
|
||||||
"CAP_KILL",
|
|
||||||
"CAP_AUDIT_WRITE",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultUnixNamespaces() []specs.LinuxNamespace {
|
|
||||||
return []specs.LinuxNamespace{
|
|
||||||
{
|
|
||||||
Type: specs.PIDNamespace,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: specs.IPCNamespace,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: specs.UTSNamespace,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: specs.MountNamespace,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Type: specs.NetworkNamespace,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func populateDefaultUnixSpec(ctx context.Context, s *Spec, id string) error {
|
|
||||||
ns, err := namespaces.NamespaceRequired(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
*s = Spec{
|
|
||||||
Version: specs.Version,
|
|
||||||
Root: &specs.Root{
|
|
||||||
Path: defaultRootfsPath,
|
|
||||||
},
|
|
||||||
Process: &specs.Process{
|
|
||||||
Cwd: "/",
|
|
||||||
NoNewPrivileges: true,
|
|
||||||
User: specs.User{
|
|
||||||
UID: 0,
|
|
||||||
GID: 0,
|
|
||||||
},
|
|
||||||
Capabilities: &specs.LinuxCapabilities{
|
|
||||||
Bounding: defaultUnixCaps(),
|
|
||||||
Permitted: defaultUnixCaps(),
|
|
||||||
Inheritable: defaultUnixCaps(),
|
|
||||||
Effective: defaultUnixCaps(),
|
|
||||||
},
|
|
||||||
Rlimits: []specs.POSIXRlimit{
|
|
||||||
{
|
|
||||||
Type: "RLIMIT_NOFILE",
|
|
||||||
Hard: uint64(1024),
|
|
||||||
Soft: uint64(1024),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Mounts: []specs.Mount{
|
|
||||||
{
|
|
||||||
Destination: "/proc",
|
|
||||||
Type: "proc",
|
|
||||||
Source: "proc",
|
|
||||||
Options: []string{"nosuid", "noexec", "nodev"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Destination: "/dev",
|
|
||||||
Type: "tmpfs",
|
|
||||||
Source: "tmpfs",
|
|
||||||
Options: []string{"nosuid", "strictatime", "mode=755", "size=65536k"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Destination: "/dev/pts",
|
|
||||||
Type: "devpts",
|
|
||||||
Source: "devpts",
|
|
||||||
Options: []string{"nosuid", "noexec", "newinstance", "ptmxmode=0666", "mode=0620", "gid=5"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Destination: "/dev/shm",
|
|
||||||
Type: "tmpfs",
|
|
||||||
Source: "shm",
|
|
||||||
Options: []string{"nosuid", "noexec", "nodev", "mode=1777", "size=65536k"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Destination: "/dev/mqueue",
|
|
||||||
Type: "mqueue",
|
|
||||||
Source: "mqueue",
|
|
||||||
Options: []string{"nosuid", "noexec", "nodev"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Destination: "/sys",
|
|
||||||
Type: "sysfs",
|
|
||||||
Source: "sysfs",
|
|
||||||
Options: []string{"nosuid", "noexec", "nodev", "ro"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Destination: "/run",
|
|
||||||
Type: "tmpfs",
|
|
||||||
Source: "tmpfs",
|
|
||||||
Options: []string{"nosuid", "strictatime", "mode=755", "size=65536k"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Linux: &specs.Linux{
|
|
||||||
MaskedPaths: []string{
|
|
||||||
"/proc/acpi",
|
|
||||||
"/proc/asound",
|
|
||||||
"/proc/kcore",
|
|
||||||
"/proc/keys",
|
|
||||||
"/proc/latency_stats",
|
|
||||||
"/proc/timer_list",
|
|
||||||
"/proc/timer_stats",
|
|
||||||
"/proc/sched_debug",
|
|
||||||
"/sys/firmware",
|
|
||||||
"/proc/scsi",
|
|
||||||
},
|
|
||||||
ReadonlyPaths: []string{
|
|
||||||
"/proc/bus",
|
|
||||||
"/proc/fs",
|
|
||||||
"/proc/irq",
|
|
||||||
"/proc/sys",
|
|
||||||
"/proc/sysrq-trigger",
|
|
||||||
},
|
|
||||||
CgroupsPath: filepath.Join("/", ns, id),
|
|
||||||
Resources: &specs.LinuxResources{
|
|
||||||
Devices: []specs.LinuxDeviceCgroup{
|
|
||||||
{
|
|
||||||
Allow: false,
|
|
||||||
Access: rwm,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Namespaces: defaultUnixNamespaces(),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func populateDefaultWindowsSpec(ctx context.Context, s *Spec, id string) error {
|
|
||||||
*s = Spec{
|
|
||||||
Version: specs.Version,
|
|
||||||
Root: &specs.Root{},
|
|
||||||
Process: &specs.Process{
|
|
||||||
Cwd: `C:\`,
|
|
||||||
},
|
|
||||||
Windows: &specs.Windows{},
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,121 +0,0 @@
|
||||||
// +build linux
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package oci
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/containers"
|
|
||||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"golang.org/x/sys/unix"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WithHostDevices adds all the hosts device nodes to the container's spec
|
|
||||||
func WithHostDevices(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
||||||
setLinux(s)
|
|
||||||
|
|
||||||
devs, err := getDevices("/dev")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
s.Linux.Devices = append(s.Linux.Devices, devs...)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getDevices(path string) ([]specs.LinuxDevice, error) {
|
|
||||||
files, err := ioutil.ReadDir(path)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var out []specs.LinuxDevice
|
|
||||||
for _, f := range files {
|
|
||||||
switch {
|
|
||||||
case f.IsDir():
|
|
||||||
switch f.Name() {
|
|
||||||
// ".lxc" & ".lxd-mounts" added to address https://github.com/lxc/lxd/issues/2825
|
|
||||||
// ".udev" added to address https://github.com/opencontainers/runc/issues/2093
|
|
||||||
case "pts", "shm", "fd", "mqueue", ".lxc", ".lxd-mounts", ".udev":
|
|
||||||
continue
|
|
||||||
default:
|
|
||||||
sub, err := getDevices(filepath.Join(path, f.Name()))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
out = append(out, sub...)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
case f.Name() == "console":
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
device, err := deviceFromPath(filepath.Join(path, f.Name()), "rwm")
|
|
||||||
if err != nil {
|
|
||||||
if err == ErrNotADevice {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out = append(out, *device)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
|
|
||||||
var stat unix.Stat_t
|
|
||||||
if err := unix.Lstat(path, &stat); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
// The type is 32bit on mips.
|
|
||||||
devNumber = uint64(stat.Rdev) // nolint: unconvert
|
|
||||||
major = unix.Major(devNumber)
|
|
||||||
minor = unix.Minor(devNumber)
|
|
||||||
)
|
|
||||||
if major == 0 {
|
|
||||||
return nil, ErrNotADevice
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
devType string
|
|
||||||
mode = stat.Mode
|
|
||||||
)
|
|
||||||
switch {
|
|
||||||
case mode&unix.S_IFBLK == unix.S_IFBLK:
|
|
||||||
devType = "b"
|
|
||||||
case mode&unix.S_IFCHR == unix.S_IFCHR:
|
|
||||||
devType = "c"
|
|
||||||
}
|
|
||||||
fm := os.FileMode(mode)
|
|
||||||
return &specs.LinuxDevice{
|
|
||||||
Type: devType,
|
|
||||||
Path: path,
|
|
||||||
Major: int64(major),
|
|
||||||
Minor: int64(minor),
|
|
||||||
FileMode: &fm,
|
|
||||||
UID: &stat.Uid,
|
|
||||||
GID: &stat.Gid,
|
|
||||||
}, nil
|
|
||||||
}
|
|
|
@ -1,120 +0,0 @@
|
||||||
// +build !linux,!windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package oci
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/containers"
|
|
||||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"golang.org/x/sys/unix"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WithHostDevices adds all the hosts device nodes to the container's spec
|
|
||||||
func WithHostDevices(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
||||||
setLinux(s)
|
|
||||||
|
|
||||||
devs, err := getDevices("/dev")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
s.Linux.Devices = append(s.Linux.Devices, devs...)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getDevices(path string) ([]specs.LinuxDevice, error) {
|
|
||||||
files, err := ioutil.ReadDir(path)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var out []specs.LinuxDevice
|
|
||||||
for _, f := range files {
|
|
||||||
switch {
|
|
||||||
case f.IsDir():
|
|
||||||
switch f.Name() {
|
|
||||||
// ".lxc" & ".lxd-mounts" added to address https://github.com/lxc/lxd/issues/2825
|
|
||||||
// ".udev" added to address https://github.com/opencontainers/runc/issues/2093
|
|
||||||
case "pts", "shm", "fd", "mqueue", ".lxc", ".lxd-mounts", ".udev":
|
|
||||||
continue
|
|
||||||
default:
|
|
||||||
sub, err := getDevices(filepath.Join(path, f.Name()))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
out = append(out, sub...)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
case f.Name() == "console":
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
device, err := deviceFromPath(filepath.Join(path, f.Name()), "rwm")
|
|
||||||
if err != nil {
|
|
||||||
if err == ErrNotADevice {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out = append(out, *device)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
|
|
||||||
var stat unix.Stat_t
|
|
||||||
if err := unix.Lstat(path, &stat); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
devNumber = uint64(stat.Rdev)
|
|
||||||
major = unix.Major(devNumber)
|
|
||||||
minor = unix.Minor(devNumber)
|
|
||||||
)
|
|
||||||
if major == 0 {
|
|
||||||
return nil, ErrNotADevice
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
devType string
|
|
||||||
mode = stat.Mode
|
|
||||||
)
|
|
||||||
switch {
|
|
||||||
case mode&unix.S_IFBLK == unix.S_IFBLK:
|
|
||||||
devType = "b"
|
|
||||||
case mode&unix.S_IFCHR == unix.S_IFCHR:
|
|
||||||
devType = "c"
|
|
||||||
}
|
|
||||||
fm := os.FileMode(mode)
|
|
||||||
return &specs.LinuxDevice{
|
|
||||||
Type: devType,
|
|
||||||
Path: path,
|
|
||||||
Major: int64(major),
|
|
||||||
Minor: int64(minor),
|
|
||||||
FileMode: &fm,
|
|
||||||
UID: &stat.Uid,
|
|
||||||
GID: &stat.Gid,
|
|
||||||
}, nil
|
|
||||||
}
|
|
|
@ -1,79 +0,0 @@
|
||||||
// +build windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package oci
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/containers"
|
|
||||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WithWindowsCPUCount sets the `Windows.Resources.CPU.Count` section to the
|
|
||||||
// `count` specified.
|
|
||||||
func WithWindowsCPUCount(count uint64) SpecOpts {
|
|
||||||
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
||||||
if s.Windows.Resources == nil {
|
|
||||||
s.Windows.Resources = &specs.WindowsResources{}
|
|
||||||
}
|
|
||||||
if s.Windows.Resources.CPU == nil {
|
|
||||||
s.Windows.Resources.CPU = &specs.WindowsCPUResources{}
|
|
||||||
}
|
|
||||||
s.Windows.Resources.CPU.Count = &count
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithWindowsIgnoreFlushesDuringBoot sets `Windows.IgnoreFlushesDuringBoot`.
|
|
||||||
func WithWindowsIgnoreFlushesDuringBoot() SpecOpts {
|
|
||||||
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
||||||
if s.Windows == nil {
|
|
||||||
s.Windows = &specs.Windows{}
|
|
||||||
}
|
|
||||||
s.Windows.IgnoreFlushesDuringBoot = true
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithWindowNetworksAllowUnqualifiedDNSQuery sets `Windows.IgnoreFlushesDuringBoot`.
|
|
||||||
func WithWindowNetworksAllowUnqualifiedDNSQuery() SpecOpts {
|
|
||||||
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
||||||
if s.Windows == nil {
|
|
||||||
s.Windows = &specs.Windows{}
|
|
||||||
}
|
|
||||||
if s.Windows.Network == nil {
|
|
||||||
s.Windows.Network = &specs.WindowsNetwork{}
|
|
||||||
}
|
|
||||||
|
|
||||||
s.Windows.Network.AllowUnqualifiedDNSQuery = true
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithHostDevices adds all the hosts device nodes to the container's spec
|
|
||||||
//
|
|
||||||
// Not supported on windows
|
|
||||||
func WithHostDevices(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
|
|
||||||
return nil, errors.New("device from path not supported on Windows")
|
|
||||||
}
|
|
|
@ -1,339 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package snapshots
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/mount"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Kind identifies the kind of snapshot.
|
|
||||||
type Kind uint8
|
|
||||||
|
|
||||||
// definitions of snapshot kinds
|
|
||||||
const (
|
|
||||||
KindUnknown Kind = iota
|
|
||||||
KindView
|
|
||||||
KindActive
|
|
||||||
KindCommitted
|
|
||||||
)
|
|
||||||
|
|
||||||
// ParseKind parses the provided string into a Kind
|
|
||||||
//
|
|
||||||
// If the string cannot be parsed KindUnknown is returned
|
|
||||||
func ParseKind(s string) Kind {
|
|
||||||
s = strings.ToLower(s)
|
|
||||||
switch s {
|
|
||||||
case "view":
|
|
||||||
return KindView
|
|
||||||
case "active":
|
|
||||||
return KindActive
|
|
||||||
case "committed":
|
|
||||||
return KindCommitted
|
|
||||||
}
|
|
||||||
|
|
||||||
return KindUnknown
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the string representation of the Kind
|
|
||||||
func (k Kind) String() string {
|
|
||||||
switch k {
|
|
||||||
case KindView:
|
|
||||||
return "View"
|
|
||||||
case KindActive:
|
|
||||||
return "Active"
|
|
||||||
case KindCommitted:
|
|
||||||
return "Committed"
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Unknown"
|
|
||||||
}
|
|
||||||
|
|
||||||
// MarshalJSON the Kind to JSON
|
|
||||||
func (k Kind) MarshalJSON() ([]byte, error) {
|
|
||||||
return json.Marshal(k.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmarshalJSON the Kind from JSON
|
|
||||||
func (k *Kind) UnmarshalJSON(b []byte) error {
|
|
||||||
var s string
|
|
||||||
if err := json.Unmarshal(b, &s); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
*k = ParseKind(s)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Info provides information about a particular snapshot.
|
|
||||||
// JSON marshallability is supported for interactive with tools like ctr,
|
|
||||||
type Info struct {
|
|
||||||
Kind Kind // active or committed snapshot
|
|
||||||
Name string // name or key of snapshot
|
|
||||||
Parent string `json:",omitempty"` // name of parent snapshot
|
|
||||||
|
|
||||||
// Labels for a snapshot.
|
|
||||||
//
|
|
||||||
// Note: only labels prefixed with `containerd.io/snapshot/` will be inherited by the
|
|
||||||
// snapshotter's `Prepare`, `View`, or `Commit` calls.
|
|
||||||
Labels map[string]string `json:",omitempty"`
|
|
||||||
Created time.Time `json:",omitempty"` // Created time
|
|
||||||
Updated time.Time `json:",omitempty"` // Last update time
|
|
||||||
}
|
|
||||||
|
|
||||||
// Usage defines statistics for disk resources consumed by the snapshot.
|
|
||||||
//
|
|
||||||
// These resources only include the resources consumed by the snapshot itself
|
|
||||||
// and does not include resources usage by the parent.
|
|
||||||
type Usage struct {
|
|
||||||
Inodes int64 // number of inodes in use.
|
|
||||||
Size int64 // provides usage, in bytes, of snapshot
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add the provided usage to the current usage
|
|
||||||
func (u *Usage) Add(other Usage) {
|
|
||||||
u.Size += other.Size
|
|
||||||
|
|
||||||
// TODO(stevvooe): assumes independent inodes, but provides and upper
|
|
||||||
// bound. This should be pretty close, assuming the inodes for a
|
|
||||||
// snapshot are roughly unique to it. Don't trust this assumption.
|
|
||||||
u.Inodes += other.Inodes
|
|
||||||
}
|
|
||||||
|
|
||||||
// Snapshotter defines the methods required to implement a snapshot snapshotter for
|
|
||||||
// allocating, snapshotting and mounting filesystem changesets. The model works
|
|
||||||
// by building up sets of changes with parent-child relationships.
|
|
||||||
//
|
|
||||||
// A snapshot represents a filesystem state. Every snapshot has a parent, where
|
|
||||||
// the empty parent is represented by the empty string. A diff can be taken
|
|
||||||
// between a parent and its snapshot to generate a classic layer.
|
|
||||||
//
|
|
||||||
// An active snapshot is created by calling `Prepare`. After mounting, changes
|
|
||||||
// can be made to the snapshot. The act of committing creates a committed
|
|
||||||
// snapshot. The committed snapshot will get the parent of active snapshot. The
|
|
||||||
// committed snapshot can then be used as a parent. Active snapshots can never
|
|
||||||
// act as a parent.
|
|
||||||
//
|
|
||||||
// Snapshots are best understood by their lifecycle. Active snapshots are
|
|
||||||
// always created with Prepare or View. Committed snapshots are always created
|
|
||||||
// with Commit. Active snapshots never become committed snapshots and vice
|
|
||||||
// versa. All snapshots may be removed.
|
|
||||||
//
|
|
||||||
// For consistency, we define the following terms to be used throughout this
|
|
||||||
// interface for snapshotter implementations:
|
|
||||||
//
|
|
||||||
// `ctx` - refers to a context.Context
|
|
||||||
// `key` - refers to an active snapshot
|
|
||||||
// `name` - refers to a committed snapshot
|
|
||||||
// `parent` - refers to the parent in relation
|
|
||||||
//
|
|
||||||
// Most methods take various combinations of these identifiers. Typically,
|
|
||||||
// `name` and `parent` will be used in cases where a method *only* takes
|
|
||||||
// committed snapshots. `key` will be used to refer to active snapshots in most
|
|
||||||
// cases, except where noted. All variables used to access snapshots use the
|
|
||||||
// same key space. For example, an active snapshot may not share the same key
|
|
||||||
// with a committed snapshot.
|
|
||||||
//
|
|
||||||
// We cover several examples below to demonstrate the utility of a snapshot
|
|
||||||
// snapshotter.
|
|
||||||
//
|
|
||||||
// Importing a Layer
|
|
||||||
//
|
|
||||||
// To import a layer, we simply have the Snapshotter provide a list of
|
|
||||||
// mounts to be applied such that our dst will capture a changeset. We start
|
|
||||||
// out by getting a path to the layer tar file and creating a temp location to
|
|
||||||
// unpack it to:
|
|
||||||
//
|
|
||||||
// layerPath, tmpDir := getLayerPath(), mkTmpDir() // just a path to layer tar file.
|
|
||||||
//
|
|
||||||
// We start by using a Snapshotter to Prepare a new snapshot transaction, using a
|
|
||||||
// key and descending from the empty parent "". To prevent our layer from being
|
|
||||||
// garbage collected during unpacking, we add the `containerd.io/gc.root` label:
|
|
||||||
//
|
|
||||||
// noGcOpt := snapshots.WithLabels(map[string]string{
|
|
||||||
// "containerd.io/gc.root": time.Now().UTC().Format(time.RFC3339),
|
|
||||||
// })
|
|
||||||
// mounts, err := snapshotter.Prepare(ctx, key, "", noGcOpt)
|
|
||||||
// if err != nil { ... }
|
|
||||||
//
|
|
||||||
// We get back a list of mounts from Snapshotter.Prepare, with the key identifying
|
|
||||||
// the active snapshot. Mount this to the temporary location with the
|
|
||||||
// following:
|
|
||||||
//
|
|
||||||
// if err := mount.All(mounts, tmpDir); err != nil { ... }
|
|
||||||
//
|
|
||||||
// Once the mounts are performed, our temporary location is ready to capture
|
|
||||||
// a diff. In practice, this works similar to a filesystem transaction. The
|
|
||||||
// next step is to unpack the layer. We have a special function unpackLayer
|
|
||||||
// that applies the contents of the layer to target location and calculates the
|
|
||||||
// DiffID of the unpacked layer (this is a requirement for docker
|
|
||||||
// implementation):
|
|
||||||
//
|
|
||||||
// layer, err := os.Open(layerPath)
|
|
||||||
// if err != nil { ... }
|
|
||||||
// digest, err := unpackLayer(tmpLocation, layer) // unpack into layer location
|
|
||||||
// if err != nil { ... }
|
|
||||||
//
|
|
||||||
// When the above completes, we should have a filesystem the represents the
|
|
||||||
// contents of the layer. Careful implementations should verify that digest
|
|
||||||
// matches the expected DiffID. When completed, we unmount the mounts:
|
|
||||||
//
|
|
||||||
// unmount(mounts) // optional, for now
|
|
||||||
//
|
|
||||||
// Now that we've verified and unpacked our layer, we commit the active
|
|
||||||
// snapshot to a name. For this example, we are just going to use the layer
|
|
||||||
// digest, but in practice, this will probably be the ChainID. This also removes
|
|
||||||
// the active snapshot:
|
|
||||||
//
|
|
||||||
// if err := snapshotter.Commit(ctx, digest.String(), key, noGcOpt); err != nil { ... }
|
|
||||||
//
|
|
||||||
// Now, we have a layer in the Snapshotter that can be accessed with the digest
|
|
||||||
// provided during commit.
|
|
||||||
//
|
|
||||||
// Importing the Next Layer
|
|
||||||
//
|
|
||||||
// Making a layer depend on the above is identical to the process described
|
|
||||||
// above except that the parent is provided as parent when calling
|
|
||||||
// Manager.Prepare, assuming a clean, unique key identifier:
|
|
||||||
//
|
|
||||||
// mounts, err := snapshotter.Prepare(ctx, key, parentDigest, noGcOpt)
|
|
||||||
//
|
|
||||||
// We then mount, apply and commit, as we did above. The new snapshot will be
|
|
||||||
// based on the content of the previous one.
|
|
||||||
//
|
|
||||||
// Running a Container
|
|
||||||
//
|
|
||||||
// To run a container, we simply provide Snapshotter.Prepare the committed image
|
|
||||||
// snapshot as the parent. After mounting, the prepared path can
|
|
||||||
// be used directly as the container's filesystem:
|
|
||||||
//
|
|
||||||
// mounts, err := snapshotter.Prepare(ctx, containerKey, imageRootFSChainID)
|
|
||||||
//
|
|
||||||
// The returned mounts can then be passed directly to the container runtime. If
|
|
||||||
// one would like to create a new image from the filesystem, Manager.Commit is
|
|
||||||
// called:
|
|
||||||
//
|
|
||||||
// if err := snapshotter.Commit(ctx, newImageSnapshot, containerKey); err != nil { ... }
|
|
||||||
//
|
|
||||||
// Alternatively, for most container runs, Snapshotter.Remove will be called to
|
|
||||||
// signal the Snapshotter to abandon the changes.
|
|
||||||
type Snapshotter interface {
|
|
||||||
// Stat returns the info for an active or committed snapshot by name or
|
|
||||||
// key.
|
|
||||||
//
|
|
||||||
// Should be used for parent resolution, existence checks and to discern
|
|
||||||
// the kind of snapshot.
|
|
||||||
Stat(ctx context.Context, key string) (Info, error)
|
|
||||||
|
|
||||||
// Update updates the info for a snapshot.
|
|
||||||
//
|
|
||||||
// Only mutable properties of a snapshot may be updated.
|
|
||||||
Update(ctx context.Context, info Info, fieldpaths ...string) (Info, error)
|
|
||||||
|
|
||||||
// Usage returns the resource usage of an active or committed snapshot
|
|
||||||
// excluding the usage of parent snapshots.
|
|
||||||
//
|
|
||||||
// The running time of this call for active snapshots is dependent on
|
|
||||||
// implementation, but may be proportional to the size of the resource.
|
|
||||||
// Callers should take this into consideration. Implementations should
|
|
||||||
// attempt to honer context cancellation and avoid taking locks when making
|
|
||||||
// the calculation.
|
|
||||||
Usage(ctx context.Context, key string) (Usage, error)
|
|
||||||
|
|
||||||
// Mounts returns the mounts for the active snapshot transaction identified
|
|
||||||
// by key. Can be called on an read-write or readonly transaction. This is
|
|
||||||
// available only for active snapshots.
|
|
||||||
//
|
|
||||||
// This can be used to recover mounts after calling View or Prepare.
|
|
||||||
Mounts(ctx context.Context, key string) ([]mount.Mount, error)
|
|
||||||
|
|
||||||
// Prepare creates an active snapshot identified by key descending from the
|
|
||||||
// provided parent. The returned mounts can be used to mount the snapshot
|
|
||||||
// to capture changes.
|
|
||||||
//
|
|
||||||
// If a parent is provided, after performing the mounts, the destination
|
|
||||||
// will start with the content of the parent. The parent must be a
|
|
||||||
// committed snapshot. Changes to the mounted destination will be captured
|
|
||||||
// in relation to the parent. The default parent, "", is an empty
|
|
||||||
// directory.
|
|
||||||
//
|
|
||||||
// The changes may be saved to a committed snapshot by calling Commit. When
|
|
||||||
// one is done with the transaction, Remove should be called on the key.
|
|
||||||
//
|
|
||||||
// Multiple calls to Prepare or View with the same key should fail.
|
|
||||||
Prepare(ctx context.Context, key, parent string, opts ...Opt) ([]mount.Mount, error)
|
|
||||||
|
|
||||||
// View behaves identically to Prepare except the result may not be
|
|
||||||
// committed back to the snapshot snapshotter. View returns a readonly view on
|
|
||||||
// the parent, with the active snapshot being tracked by the given key.
|
|
||||||
//
|
|
||||||
// This method operates identically to Prepare, except that Mounts returned
|
|
||||||
// may have the readonly flag set. Any modifications to the underlying
|
|
||||||
// filesystem will be ignored. Implementations may perform this in a more
|
|
||||||
// efficient manner that differs from what would be attempted with
|
|
||||||
// `Prepare`.
|
|
||||||
//
|
|
||||||
// Commit may not be called on the provided key and will return an error.
|
|
||||||
// To collect the resources associated with key, Remove must be called with
|
|
||||||
// key as the argument.
|
|
||||||
View(ctx context.Context, key, parent string, opts ...Opt) ([]mount.Mount, error)
|
|
||||||
|
|
||||||
// Commit captures the changes between key and its parent into a snapshot
|
|
||||||
// identified by name. The name can then be used with the snapshotter's other
|
|
||||||
// methods to create subsequent snapshots.
|
|
||||||
//
|
|
||||||
// A committed snapshot will be created under name with the parent of the
|
|
||||||
// active snapshot.
|
|
||||||
//
|
|
||||||
// After commit, the snapshot identified by key is removed.
|
|
||||||
Commit(ctx context.Context, name, key string, opts ...Opt) error
|
|
||||||
|
|
||||||
// Remove the committed or active snapshot by the provided key.
|
|
||||||
//
|
|
||||||
// All resources associated with the key will be removed.
|
|
||||||
//
|
|
||||||
// If the snapshot is a parent of another snapshot, its children must be
|
|
||||||
// removed before proceeding.
|
|
||||||
Remove(ctx context.Context, key string) error
|
|
||||||
|
|
||||||
// Walk all snapshots in the snapshotter. For each snapshot in the
|
|
||||||
// snapshotter, the function will be called.
|
|
||||||
Walk(ctx context.Context, fn func(context.Context, Info) error) error
|
|
||||||
|
|
||||||
// Close releases the internal resources.
|
|
||||||
//
|
|
||||||
// Close is expected to be called on the end of the lifecycle of the snapshotter,
|
|
||||||
// but not mandatory.
|
|
||||||
//
|
|
||||||
// Close returns nil when it is already closed.
|
|
||||||
Close() error
|
|
||||||
}
|
|
||||||
|
|
||||||
// Opt allows setting mutable snapshot properties on creation
|
|
||||||
type Opt func(info *Info) error
|
|
||||||
|
|
||||||
// WithLabels adds labels to a created snapshot
|
|
||||||
func WithLabels(labels map[string]string) Opt {
|
|
||||||
return func(info *Info) error {
|
|
||||||
info.Labels = labels
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,201 +0,0 @@
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following
|
|
||||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
||||||
replaced with your own identifying information. (Don't include
|
|
||||||
the brackets!) The text should be enclosed in the appropriate
|
|
||||||
comment syntax for the file format. We also recommend that a
|
|
||||||
file or class name and description of purpose be included on the
|
|
||||||
same "printed page" as the copyright notice for easier
|
|
||||||
identification within third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
|
@ -1,62 +0,0 @@
|
||||||
# ttrpc
|
|
||||||
|
|
||||||
[![Build Status](https://travis-ci.org/containerd/ttrpc.svg?branch=master)](https://travis-ci.org/containerd/ttrpc)
|
|
||||||
|
|
||||||
GRPC for low-memory environments.
|
|
||||||
|
|
||||||
The existing grpc-go project requires a lot of memory overhead for importing
|
|
||||||
packages and at runtime. While this is great for many services with low density
|
|
||||||
requirements, this can be a problem when running a large number of services on
|
|
||||||
a single machine or on a machine with a small amount of memory.
|
|
||||||
|
|
||||||
Using the same GRPC definitions, this project reduces the binary size and
|
|
||||||
protocol overhead required. We do this by eliding the `net/http`, `net/http2`
|
|
||||||
and `grpc` package used by grpc replacing it with a lightweight framing
|
|
||||||
protocol. The result are smaller binaries that use less resident memory with
|
|
||||||
the same ease of use as GRPC.
|
|
||||||
|
|
||||||
Please note that while this project supports generating either end of the
|
|
||||||
protocol, the generated service definitions will be incompatible with regular
|
|
||||||
GRPC services, as they do not speak the same protocol.
|
|
||||||
|
|
||||||
# Usage
|
|
||||||
|
|
||||||
Create a gogo vanity binary (see
|
|
||||||
[`cmd/protoc-gen-gogottrpc/main.go`](cmd/protoc-gen-gogottrpc/main.go) for an
|
|
||||||
example with the ttrpc plugin enabled.
|
|
||||||
|
|
||||||
It's recommended to use [`protobuild`](https://github.com//stevvooe/protobuild)
|
|
||||||
to build the protobufs for this project, but this will work with protoc
|
|
||||||
directly, if required.
|
|
||||||
|
|
||||||
# Differences from GRPC
|
|
||||||
|
|
||||||
- The protocol stack has been replaced with a lighter protocol that doesn't
|
|
||||||
require http, http2 and tls.
|
|
||||||
- The client and server interface are identical whereas in GRPC there is a
|
|
||||||
client and server interface that are different.
|
|
||||||
- The Go stdlib context package is used instead.
|
|
||||||
- No support for streams yet.
|
|
||||||
|
|
||||||
# Status
|
|
||||||
|
|
||||||
Very new. YMMV.
|
|
||||||
|
|
||||||
TODO:
|
|
||||||
|
|
||||||
- [X] Plumb error codes and GRPC status
|
|
||||||
- [X] Remove use of any type and dependency on typeurl package
|
|
||||||
- [X] Ensure that protocol can support streaming in the future
|
|
||||||
- [ ] Document protocol layout
|
|
||||||
- [ ] Add testing under concurrent load to ensure
|
|
||||||
- [ ] Verify connection error handling
|
|
||||||
|
|
||||||
# Project details
|
|
||||||
|
|
||||||
ttrpc is a containerd sub-project, licensed under the [Apache 2.0 license](./LICENSE).
|
|
||||||
As a containerd sub-project, you will find the:
|
|
||||||
* [Project governance](https://github.com/containerd/project/blob/master/GOVERNANCE.md),
|
|
||||||
* [Maintainers](https://github.com/containerd/project/blob/master/MAINTAINERS),
|
|
||||||
* and [Contributing guidelines](https://github.com/containerd/project/blob/master/CONTRIBUTING.md)
|
|
||||||
|
|
||||||
information in our [`containerd/project`](https://github.com/containerd/project) repository.
|
|
|
@ -1,153 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"encoding/binary"
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"google.golang.org/grpc/codes"
|
|
||||||
"google.golang.org/grpc/status"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
messageHeaderLength = 10
|
|
||||||
messageLengthMax = 4 << 20
|
|
||||||
)
|
|
||||||
|
|
||||||
type messageType uint8
|
|
||||||
|
|
||||||
const (
|
|
||||||
messageTypeRequest messageType = 0x1
|
|
||||||
messageTypeResponse messageType = 0x2
|
|
||||||
)
|
|
||||||
|
|
||||||
// messageHeader represents the fixed-length message header of 10 bytes sent
|
|
||||||
// with every request.
|
|
||||||
type messageHeader struct {
|
|
||||||
Length uint32 // length excluding this header. b[:4]
|
|
||||||
StreamID uint32 // identifies which request stream message is a part of. b[4:8]
|
|
||||||
Type messageType // message type b[8]
|
|
||||||
Flags uint8 // reserved b[9]
|
|
||||||
}
|
|
||||||
|
|
||||||
func readMessageHeader(p []byte, r io.Reader) (messageHeader, error) {
|
|
||||||
_, err := io.ReadFull(r, p[:messageHeaderLength])
|
|
||||||
if err != nil {
|
|
||||||
return messageHeader{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return messageHeader{
|
|
||||||
Length: binary.BigEndian.Uint32(p[:4]),
|
|
||||||
StreamID: binary.BigEndian.Uint32(p[4:8]),
|
|
||||||
Type: messageType(p[8]),
|
|
||||||
Flags: p[9],
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeMessageHeader(w io.Writer, p []byte, mh messageHeader) error {
|
|
||||||
binary.BigEndian.PutUint32(p[:4], mh.Length)
|
|
||||||
binary.BigEndian.PutUint32(p[4:8], mh.StreamID)
|
|
||||||
p[8] = byte(mh.Type)
|
|
||||||
p[9] = mh.Flags
|
|
||||||
|
|
||||||
_, err := w.Write(p[:])
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var buffers sync.Pool
|
|
||||||
|
|
||||||
type channel struct {
|
|
||||||
conn net.Conn
|
|
||||||
bw *bufio.Writer
|
|
||||||
br *bufio.Reader
|
|
||||||
hrbuf [messageHeaderLength]byte // avoid alloc when reading header
|
|
||||||
hwbuf [messageHeaderLength]byte
|
|
||||||
}
|
|
||||||
|
|
||||||
func newChannel(conn net.Conn) *channel {
|
|
||||||
return &channel{
|
|
||||||
conn: conn,
|
|
||||||
bw: bufio.NewWriter(conn),
|
|
||||||
br: bufio.NewReader(conn),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// recv a message from the channel. The returned buffer contains the message.
|
|
||||||
//
|
|
||||||
// If a valid grpc status is returned, the message header
|
|
||||||
// returned will be valid and caller should send that along to
|
|
||||||
// the correct consumer. The bytes on the underlying channel
|
|
||||||
// will be discarded.
|
|
||||||
func (ch *channel) recv() (messageHeader, []byte, error) {
|
|
||||||
mh, err := readMessageHeader(ch.hrbuf[:], ch.br)
|
|
||||||
if err != nil {
|
|
||||||
return messageHeader{}, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if mh.Length > uint32(messageLengthMax) {
|
|
||||||
if _, err := ch.br.Discard(int(mh.Length)); err != nil {
|
|
||||||
return mh, nil, errors.Wrapf(err, "failed to discard after receiving oversized message")
|
|
||||||
}
|
|
||||||
|
|
||||||
return mh, nil, status.Errorf(codes.ResourceExhausted, "message length %v exceed maximum message size of %v", mh.Length, messageLengthMax)
|
|
||||||
}
|
|
||||||
|
|
||||||
p := ch.getmbuf(int(mh.Length))
|
|
||||||
if _, err := io.ReadFull(ch.br, p); err != nil {
|
|
||||||
return messageHeader{}, nil, errors.Wrapf(err, "failed reading message")
|
|
||||||
}
|
|
||||||
|
|
||||||
return mh, p, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ch *channel) send(streamID uint32, t messageType, p []byte) error {
|
|
||||||
if err := writeMessageHeader(ch.bw, ch.hwbuf[:], messageHeader{Length: uint32(len(p)), StreamID: streamID, Type: t}); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := ch.bw.Write(p)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return ch.bw.Flush()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ch *channel) getmbuf(size int) []byte {
|
|
||||||
// we can't use the standard New method on pool because we want to allocate
|
|
||||||
// based on size.
|
|
||||||
b, ok := buffers.Get().(*[]byte)
|
|
||||||
if !ok || cap(*b) < size {
|
|
||||||
// TODO(stevvooe): It may be better to allocate these in fixed length
|
|
||||||
// buckets to reduce fragmentation but its not clear that would help
|
|
||||||
// with performance. An ilogb approach or similar would work well.
|
|
||||||
bb := make([]byte, size)
|
|
||||||
b = &bb
|
|
||||||
} else {
|
|
||||||
*b = (*b)[:size]
|
|
||||||
}
|
|
||||||
return *b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (ch *channel) putmbuf(p []byte) {
|
|
||||||
buffers.Put(&p)
|
|
||||||
}
|
|
|
@ -1,350 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gogo/protobuf/proto"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"google.golang.org/grpc/codes"
|
|
||||||
"google.golang.org/grpc/status"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ErrClosed is returned by client methods when the underlying connection is
|
|
||||||
// closed.
|
|
||||||
var ErrClosed = errors.New("ttrpc: closed")
|
|
||||||
|
|
||||||
// Client for a ttrpc server
|
|
||||||
type Client struct {
|
|
||||||
codec codec
|
|
||||||
conn net.Conn
|
|
||||||
channel *channel
|
|
||||||
calls chan *callRequest
|
|
||||||
|
|
||||||
ctx context.Context
|
|
||||||
closed func()
|
|
||||||
|
|
||||||
closeOnce sync.Once
|
|
||||||
userCloseFunc func()
|
|
||||||
|
|
||||||
errOnce sync.Once
|
|
||||||
err error
|
|
||||||
interceptor UnaryClientInterceptor
|
|
||||||
}
|
|
||||||
|
|
||||||
// ClientOpts configures a client
|
|
||||||
type ClientOpts func(c *Client)
|
|
||||||
|
|
||||||
// WithOnClose sets the close func whenever the client's Close() method is called
|
|
||||||
func WithOnClose(onClose func()) ClientOpts {
|
|
||||||
return func(c *Client) {
|
|
||||||
c.userCloseFunc = onClose
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithUnaryClientInterceptor sets the provided client interceptor
|
|
||||||
func WithUnaryClientInterceptor(i UnaryClientInterceptor) ClientOpts {
|
|
||||||
return func(c *Client) {
|
|
||||||
c.interceptor = i
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewClient(conn net.Conn, opts ...ClientOpts) *Client {
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
c := &Client{
|
|
||||||
codec: codec{},
|
|
||||||
conn: conn,
|
|
||||||
channel: newChannel(conn),
|
|
||||||
calls: make(chan *callRequest),
|
|
||||||
closed: cancel,
|
|
||||||
ctx: ctx,
|
|
||||||
userCloseFunc: func() {},
|
|
||||||
interceptor: defaultClientInterceptor,
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, o := range opts {
|
|
||||||
o(c)
|
|
||||||
}
|
|
||||||
|
|
||||||
go c.run()
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
|
|
||||||
type callRequest struct {
|
|
||||||
ctx context.Context
|
|
||||||
req *Request
|
|
||||||
resp *Response // response will be written back here
|
|
||||||
errs chan error // error written here on completion
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Call(ctx context.Context, service, method string, req, resp interface{}) error {
|
|
||||||
payload, err := c.codec.Marshal(req)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
creq = &Request{
|
|
||||||
Service: service,
|
|
||||||
Method: method,
|
|
||||||
Payload: payload,
|
|
||||||
}
|
|
||||||
|
|
||||||
cresp = &Response{}
|
|
||||||
)
|
|
||||||
|
|
||||||
if metadata, ok := GetMetadata(ctx); ok {
|
|
||||||
metadata.setRequest(creq)
|
|
||||||
}
|
|
||||||
|
|
||||||
if dl, ok := ctx.Deadline(); ok {
|
|
||||||
creq.TimeoutNano = dl.Sub(time.Now()).Nanoseconds()
|
|
||||||
}
|
|
||||||
|
|
||||||
info := &UnaryClientInfo{
|
|
||||||
FullMethod: fullPath(service, method),
|
|
||||||
}
|
|
||||||
if err := c.interceptor(ctx, creq, cresp, info, c.dispatch); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := c.codec.Unmarshal(cresp.Payload, resp); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if cresp.Status != nil && cresp.Status.Code != int32(codes.OK) {
|
|
||||||
return status.ErrorProto(cresp.Status)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) dispatch(ctx context.Context, req *Request, resp *Response) error {
|
|
||||||
errs := make(chan error, 1)
|
|
||||||
call := &callRequest{
|
|
||||||
ctx: ctx,
|
|
||||||
req: req,
|
|
||||||
resp: resp,
|
|
||||||
errs: errs,
|
|
||||||
}
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
case c.calls <- call:
|
|
||||||
case <-c.ctx.Done():
|
|
||||||
return c.error()
|
|
||||||
}
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
case err := <-errs:
|
|
||||||
return filterCloseErr(err)
|
|
||||||
case <-c.ctx.Done():
|
|
||||||
return c.error()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) Close() error {
|
|
||||||
c.closeOnce.Do(func() {
|
|
||||||
c.closed()
|
|
||||||
})
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type message struct {
|
|
||||||
messageHeader
|
|
||||||
p []byte
|
|
||||||
err error
|
|
||||||
}
|
|
||||||
|
|
||||||
type receiver struct {
|
|
||||||
wg *sync.WaitGroup
|
|
||||||
messages chan *message
|
|
||||||
err error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *receiver) run(ctx context.Context, c *channel) {
|
|
||||||
defer r.wg.Done()
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
r.err = ctx.Err()
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
mh, p, err := c.recv()
|
|
||||||
if err != nil {
|
|
||||||
_, ok := status.FromError(err)
|
|
||||||
if !ok {
|
|
||||||
// treat all errors that are not an rpc status as terminal.
|
|
||||||
// all others poison the connection.
|
|
||||||
r.err = filterCloseErr(err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case r.messages <- &message{
|
|
||||||
messageHeader: mh,
|
|
||||||
p: p[:mh.Length],
|
|
||||||
err: err,
|
|
||||||
}:
|
|
||||||
case <-ctx.Done():
|
|
||||||
r.err = ctx.Err()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) run() {
|
|
||||||
var (
|
|
||||||
streamID uint32 = 1
|
|
||||||
waiters = make(map[uint32]*callRequest)
|
|
||||||
calls = c.calls
|
|
||||||
incoming = make(chan *message)
|
|
||||||
receiversDone = make(chan struct{})
|
|
||||||
wg sync.WaitGroup
|
|
||||||
)
|
|
||||||
|
|
||||||
// broadcast the shutdown error to the remaining waiters.
|
|
||||||
abortWaiters := func(wErr error) {
|
|
||||||
for _, waiter := range waiters {
|
|
||||||
waiter.errs <- wErr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
recv := &receiver{
|
|
||||||
wg: &wg,
|
|
||||||
messages: incoming,
|
|
||||||
}
|
|
||||||
wg.Add(1)
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
wg.Wait()
|
|
||||||
close(receiversDone)
|
|
||||||
}()
|
|
||||||
go recv.run(c.ctx, c.channel)
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
c.conn.Close()
|
|
||||||
c.userCloseFunc()
|
|
||||||
}()
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case call := <-calls:
|
|
||||||
if err := c.send(streamID, messageTypeRequest, call.req); err != nil {
|
|
||||||
call.errs <- err
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
waiters[streamID] = call
|
|
||||||
streamID += 2 // enforce odd client initiated request ids
|
|
||||||
case msg := <-incoming:
|
|
||||||
call, ok := waiters[msg.StreamID]
|
|
||||||
if !ok {
|
|
||||||
logrus.Errorf("ttrpc: received message for unknown channel %v", msg.StreamID)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
call.errs <- c.recv(call.resp, msg)
|
|
||||||
delete(waiters, msg.StreamID)
|
|
||||||
case <-receiversDone:
|
|
||||||
// all the receivers have exited
|
|
||||||
if recv.err != nil {
|
|
||||||
c.setError(recv.err)
|
|
||||||
}
|
|
||||||
// don't return out, let the close of the context trigger the abort of waiters
|
|
||||||
c.Close()
|
|
||||||
case <-c.ctx.Done():
|
|
||||||
abortWaiters(c.error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) error() error {
|
|
||||||
c.errOnce.Do(func() {
|
|
||||||
if c.err == nil {
|
|
||||||
c.err = ErrClosed
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return c.err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) setError(err error) {
|
|
||||||
c.errOnce.Do(func() {
|
|
||||||
c.err = err
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) send(streamID uint32, mtype messageType, msg interface{}) error {
|
|
||||||
p, err := c.codec.Marshal(msg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return c.channel.send(streamID, mtype, p)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Client) recv(resp *Response, msg *message) error {
|
|
||||||
if msg.err != nil {
|
|
||||||
return msg.err
|
|
||||||
}
|
|
||||||
|
|
||||||
if msg.Type != messageTypeResponse {
|
|
||||||
return errors.New("unknown message type received")
|
|
||||||
}
|
|
||||||
|
|
||||||
defer c.channel.putmbuf(msg.p)
|
|
||||||
return proto.Unmarshal(msg.p, resp)
|
|
||||||
}
|
|
||||||
|
|
||||||
// filterCloseErr rewrites EOF and EPIPE errors to ErrClosed. Use when
|
|
||||||
// returning from call or handling errors from main read loop.
|
|
||||||
//
|
|
||||||
// This purposely ignores errors with a wrapped cause.
|
|
||||||
func filterCloseErr(err error) error {
|
|
||||||
switch {
|
|
||||||
case err == nil:
|
|
||||||
return nil
|
|
||||||
case err == io.EOF:
|
|
||||||
return ErrClosed
|
|
||||||
case errors.Cause(err) == io.EOF:
|
|
||||||
return ErrClosed
|
|
||||||
case strings.Contains(err.Error(), "use of closed network connection"):
|
|
||||||
return ErrClosed
|
|
||||||
default:
|
|
||||||
// if we have an epipe on a write, we cast to errclosed
|
|
||||||
if oerr, ok := err.(*net.OpError); ok && oerr.Op == "write" {
|
|
||||||
if serr, ok := oerr.Err.(*os.SyscallError); ok && serr.Err == syscall.EPIPE {
|
|
||||||
return ErrClosed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
|
@ -1,42 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/gogo/protobuf/proto"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
type codec struct{}
|
|
||||||
|
|
||||||
func (c codec) Marshal(msg interface{}) ([]byte, error) {
|
|
||||||
switch v := msg.(type) {
|
|
||||||
case proto.Message:
|
|
||||||
return proto.Marshal(v)
|
|
||||||
default:
|
|
||||||
return nil, errors.Errorf("ttrpc: cannot marshal unknown type: %T", msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c codec) Unmarshal(p []byte, msg interface{}) error {
|
|
||||||
switch v := msg.(type) {
|
|
||||||
case proto.Message:
|
|
||||||
return proto.Unmarshal(p, v)
|
|
||||||
default:
|
|
||||||
return errors.Errorf("ttrpc: cannot unmarshal into unknown type: %T", msg)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import "github.com/pkg/errors"
|
|
||||||
|
|
||||||
type serverConfig struct {
|
|
||||||
handshaker Handshaker
|
|
||||||
interceptor UnaryServerInterceptor
|
|
||||||
}
|
|
||||||
|
|
||||||
// ServerOpt for configuring a ttrpc server
|
|
||||||
type ServerOpt func(*serverConfig) error
|
|
||||||
|
|
||||||
// WithServerHandshaker can be passed to NewServer to ensure that the
|
|
||||||
// handshaker is called before every connection attempt.
|
|
||||||
//
|
|
||||||
// Only one handshaker is allowed per server.
|
|
||||||
func WithServerHandshaker(handshaker Handshaker) ServerOpt {
|
|
||||||
return func(c *serverConfig) error {
|
|
||||||
if c.handshaker != nil {
|
|
||||||
return errors.New("only one handshaker allowed per server")
|
|
||||||
}
|
|
||||||
c.handshaker = handshaker
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithUnaryServerInterceptor sets the provided interceptor on the server
|
|
||||||
func WithUnaryServerInterceptor(i UnaryServerInterceptor) ServerOpt {
|
|
||||||
return func(c *serverConfig) error {
|
|
||||||
if c.interceptor != nil {
|
|
||||||
return errors.New("only one interceptor allowed per server")
|
|
||||||
}
|
|
||||||
c.interceptor = i
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"net"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Handshaker defines the interface for connection handshakes performed on the
|
|
||||||
// server or client when first connecting.
|
|
||||||
type Handshaker interface {
|
|
||||||
// Handshake should confirm or decorate a connection that may be incoming
|
|
||||||
// to a server or outgoing from a client.
|
|
||||||
//
|
|
||||||
// If this returns without an error, the caller should use the connection
|
|
||||||
// in place of the original connection.
|
|
||||||
//
|
|
||||||
// The second return value can contain credential specific data, such as
|
|
||||||
// unix socket credentials or TLS information.
|
|
||||||
//
|
|
||||||
// While we currently only have implementations on the server-side, this
|
|
||||||
// interface should be sufficient to implement similar handshakes on the
|
|
||||||
// client-side.
|
|
||||||
Handshake(ctx context.Context, conn net.Conn) (net.Conn, interface{}, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type handshakerFunc func(ctx context.Context, conn net.Conn) (net.Conn, interface{}, error)
|
|
||||||
|
|
||||||
func (fn handshakerFunc) Handshake(ctx context.Context, conn net.Conn) (net.Conn, interface{}, error) {
|
|
||||||
return fn(ctx, conn)
|
|
||||||
}
|
|
||||||
|
|
||||||
func noopHandshake(ctx context.Context, conn net.Conn) (net.Conn, interface{}, error) {
|
|
||||||
return conn, nil, nil
|
|
||||||
}
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import "context"
|
|
||||||
|
|
||||||
// UnaryServerInfo provides information about the server request
|
|
||||||
type UnaryServerInfo struct {
|
|
||||||
FullMethod string
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnaryClientInfo provides information about the client request
|
|
||||||
type UnaryClientInfo struct {
|
|
||||||
FullMethod string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unmarshaler contains the server request data and allows it to be unmarshaled
|
|
||||||
// into a concrete type
|
|
||||||
type Unmarshaler func(interface{}) error
|
|
||||||
|
|
||||||
// Invoker invokes the client's request and response from the ttrpc server
|
|
||||||
type Invoker func(context.Context, *Request, *Response) error
|
|
||||||
|
|
||||||
// UnaryServerInterceptor specifies the interceptor function for server request/response
|
|
||||||
type UnaryServerInterceptor func(context.Context, Unmarshaler, *UnaryServerInfo, Method) (interface{}, error)
|
|
||||||
|
|
||||||
// UnaryClientInterceptor specifies the interceptor function for client request/response
|
|
||||||
type UnaryClientInterceptor func(context.Context, *Request, *Response, *UnaryClientInfo, Invoker) error
|
|
||||||
|
|
||||||
func defaultServerInterceptor(ctx context.Context, unmarshal Unmarshaler, info *UnaryServerInfo, method Method) (interface{}, error) {
|
|
||||||
return method(ctx, unmarshal)
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultClientInterceptor(ctx context.Context, req *Request, resp *Response, _ *UnaryClientInfo, invoker Invoker) error {
|
|
||||||
return invoker(ctx, req, resp)
|
|
||||||
}
|
|
|
@ -1,107 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MD is the user type for ttrpc metadata
|
|
||||||
type MD map[string][]string
|
|
||||||
|
|
||||||
// Get returns the metadata for a given key when they exist.
|
|
||||||
// If there is no metadata, a nil slice and false are returned.
|
|
||||||
func (m MD) Get(key string) ([]string, bool) {
|
|
||||||
key = strings.ToLower(key)
|
|
||||||
list, ok := m[key]
|
|
||||||
if !ok || len(list) == 0 {
|
|
||||||
return nil, false
|
|
||||||
}
|
|
||||||
|
|
||||||
return list, true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set sets the provided values for a given key.
|
|
||||||
// The values will overwrite any existing values.
|
|
||||||
// If no values provided, a key will be deleted.
|
|
||||||
func (m MD) Set(key string, values ...string) {
|
|
||||||
key = strings.ToLower(key)
|
|
||||||
if len(values) == 0 {
|
|
||||||
delete(m, key)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
m[key] = values
|
|
||||||
}
|
|
||||||
|
|
||||||
// Append appends additional values to the given key.
|
|
||||||
func (m MD) Append(key string, values ...string) {
|
|
||||||
key = strings.ToLower(key)
|
|
||||||
if len(values) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
current, ok := m[key]
|
|
||||||
if ok {
|
|
||||||
m.Set(key, append(current, values...)...)
|
|
||||||
} else {
|
|
||||||
m.Set(key, values...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m MD) setRequest(r *Request) {
|
|
||||||
for k, values := range m {
|
|
||||||
for _, v := range values {
|
|
||||||
r.Metadata = append(r.Metadata, &KeyValue{
|
|
||||||
Key: k,
|
|
||||||
Value: v,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m MD) fromRequest(r *Request) {
|
|
||||||
for _, kv := range r.Metadata {
|
|
||||||
m[kv.Key] = append(m[kv.Key], kv.Value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type metadataKey struct{}
|
|
||||||
|
|
||||||
// GetMetadata retrieves metadata from context.Context (previously attached with WithMetadata)
|
|
||||||
func GetMetadata(ctx context.Context) (MD, bool) {
|
|
||||||
metadata, ok := ctx.Value(metadataKey{}).(MD)
|
|
||||||
return metadata, ok
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetMetadataValue gets a specific metadata value by name from context.Context
|
|
||||||
func GetMetadataValue(ctx context.Context, name string) (string, bool) {
|
|
||||||
metadata, ok := GetMetadata(ctx)
|
|
||||||
if !ok {
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
|
|
||||||
if list, ok := metadata.Get(name); ok {
|
|
||||||
return list[0], true
|
|
||||||
}
|
|
||||||
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithMetadata attaches metadata map to a context.Context
|
|
||||||
func WithMetadata(ctx context.Context, md MD) context.Context {
|
|
||||||
return context.WithValue(ctx, metadataKey{}, md)
|
|
||||||
}
|
|
|
@ -1,485 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"math/rand"
|
|
||||||
"net"
|
|
||||||
"sync"
|
|
||||||
"sync/atomic"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
"google.golang.org/grpc/codes"
|
|
||||||
"google.golang.org/grpc/status"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ErrServerClosed = errors.New("ttrpc: server closed")
|
|
||||||
)
|
|
||||||
|
|
||||||
type Server struct {
|
|
||||||
config *serverConfig
|
|
||||||
services *serviceSet
|
|
||||||
codec codec
|
|
||||||
|
|
||||||
mu sync.Mutex
|
|
||||||
listeners map[net.Listener]struct{}
|
|
||||||
connections map[*serverConn]struct{} // all connections to current state
|
|
||||||
done chan struct{} // marks point at which we stop serving requests
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewServer(opts ...ServerOpt) (*Server, error) {
|
|
||||||
config := &serverConfig{}
|
|
||||||
for _, opt := range opts {
|
|
||||||
if err := opt(config); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if config.interceptor == nil {
|
|
||||||
config.interceptor = defaultServerInterceptor
|
|
||||||
}
|
|
||||||
|
|
||||||
return &Server{
|
|
||||||
config: config,
|
|
||||||
services: newServiceSet(config.interceptor),
|
|
||||||
done: make(chan struct{}),
|
|
||||||
listeners: make(map[net.Listener]struct{}),
|
|
||||||
connections: make(map[*serverConn]struct{}),
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) Register(name string, methods map[string]Method) {
|
|
||||||
s.services.register(name, methods)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) Serve(ctx context.Context, l net.Listener) error {
|
|
||||||
s.addListener(l)
|
|
||||||
defer s.closeListener(l)
|
|
||||||
|
|
||||||
var (
|
|
||||||
backoff time.Duration
|
|
||||||
handshaker = s.config.handshaker
|
|
||||||
)
|
|
||||||
|
|
||||||
if handshaker == nil {
|
|
||||||
handshaker = handshakerFunc(noopHandshake)
|
|
||||||
}
|
|
||||||
|
|
||||||
for {
|
|
||||||
conn, err := l.Accept()
|
|
||||||
if err != nil {
|
|
||||||
select {
|
|
||||||
case <-s.done:
|
|
||||||
return ErrServerClosed
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
if terr, ok := err.(interface {
|
|
||||||
Temporary() bool
|
|
||||||
}); ok && terr.Temporary() {
|
|
||||||
if backoff == 0 {
|
|
||||||
backoff = time.Millisecond
|
|
||||||
} else {
|
|
||||||
backoff *= 2
|
|
||||||
}
|
|
||||||
|
|
||||||
if max := time.Second; backoff > max {
|
|
||||||
backoff = max
|
|
||||||
}
|
|
||||||
|
|
||||||
sleep := time.Duration(rand.Int63n(int64(backoff)))
|
|
||||||
logrus.WithError(err).Errorf("ttrpc: failed accept; backoff %v", sleep)
|
|
||||||
time.Sleep(sleep)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
backoff = 0
|
|
||||||
|
|
||||||
approved, handshake, err := handshaker.Handshake(ctx, conn)
|
|
||||||
if err != nil {
|
|
||||||
logrus.WithError(err).Errorf("ttrpc: refusing connection after handshake")
|
|
||||||
conn.Close()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
sc := s.newConn(approved, handshake)
|
|
||||||
go sc.run(ctx)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) Shutdown(ctx context.Context) error {
|
|
||||||
s.mu.Lock()
|
|
||||||
select {
|
|
||||||
case <-s.done:
|
|
||||||
default:
|
|
||||||
// protected by mutex
|
|
||||||
close(s.done)
|
|
||||||
}
|
|
||||||
lnerr := s.closeListeners()
|
|
||||||
s.mu.Unlock()
|
|
||||||
|
|
||||||
ticker := time.NewTicker(200 * time.Millisecond)
|
|
||||||
defer ticker.Stop()
|
|
||||||
for {
|
|
||||||
if s.closeIdleConns() {
|
|
||||||
return lnerr
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return ctx.Err()
|
|
||||||
case <-ticker.C:
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close the server without waiting for active connections.
|
|
||||||
func (s *Server) Close() error {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-s.done:
|
|
||||||
default:
|
|
||||||
// protected by mutex
|
|
||||||
close(s.done)
|
|
||||||
}
|
|
||||||
|
|
||||||
err := s.closeListeners()
|
|
||||||
for c := range s.connections {
|
|
||||||
c.close()
|
|
||||||
delete(s.connections, c)
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) addListener(l net.Listener) {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
s.listeners[l] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) closeListener(l net.Listener) error {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
|
|
||||||
return s.closeListenerLocked(l)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) closeListenerLocked(l net.Listener) error {
|
|
||||||
defer delete(s.listeners, l)
|
|
||||||
return l.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) closeListeners() error {
|
|
||||||
var err error
|
|
||||||
for l := range s.listeners {
|
|
||||||
if cerr := s.closeListenerLocked(l); cerr != nil && err == nil {
|
|
||||||
err = cerr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) addConnection(c *serverConn) {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
|
|
||||||
s.connections[c] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) closeIdleConns() bool {
|
|
||||||
s.mu.Lock()
|
|
||||||
defer s.mu.Unlock()
|
|
||||||
quiescent := true
|
|
||||||
for c := range s.connections {
|
|
||||||
st, ok := c.getState()
|
|
||||||
if !ok || st != connStateIdle {
|
|
||||||
quiescent = false
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
c.close()
|
|
||||||
delete(s.connections, c)
|
|
||||||
}
|
|
||||||
return quiescent
|
|
||||||
}
|
|
||||||
|
|
||||||
type connState int
|
|
||||||
|
|
||||||
const (
|
|
||||||
connStateActive = iota + 1 // outstanding requests
|
|
||||||
connStateIdle // no requests
|
|
||||||
connStateClosed // closed connection
|
|
||||||
)
|
|
||||||
|
|
||||||
func (cs connState) String() string {
|
|
||||||
switch cs {
|
|
||||||
case connStateActive:
|
|
||||||
return "active"
|
|
||||||
case connStateIdle:
|
|
||||||
return "idle"
|
|
||||||
case connStateClosed:
|
|
||||||
return "closed"
|
|
||||||
default:
|
|
||||||
return "unknown"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Server) newConn(conn net.Conn, handshake interface{}) *serverConn {
|
|
||||||
c := &serverConn{
|
|
||||||
server: s,
|
|
||||||
conn: conn,
|
|
||||||
handshake: handshake,
|
|
||||||
shutdown: make(chan struct{}),
|
|
||||||
}
|
|
||||||
c.setState(connStateIdle)
|
|
||||||
s.addConnection(c)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
|
|
||||||
type serverConn struct {
|
|
||||||
server *Server
|
|
||||||
conn net.Conn
|
|
||||||
handshake interface{} // data from handshake, not used for now
|
|
||||||
state atomic.Value
|
|
||||||
|
|
||||||
shutdownOnce sync.Once
|
|
||||||
shutdown chan struct{} // forced shutdown, used by close
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *serverConn) getState() (connState, bool) {
|
|
||||||
cs, ok := c.state.Load().(connState)
|
|
||||||
return cs, ok
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *serverConn) setState(newstate connState) {
|
|
||||||
c.state.Store(newstate)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *serverConn) close() error {
|
|
||||||
c.shutdownOnce.Do(func() {
|
|
||||||
close(c.shutdown)
|
|
||||||
})
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *serverConn) run(sctx context.Context) {
|
|
||||||
type (
|
|
||||||
request struct {
|
|
||||||
id uint32
|
|
||||||
req *Request
|
|
||||||
}
|
|
||||||
|
|
||||||
response struct {
|
|
||||||
id uint32
|
|
||||||
resp *Response
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ch = newChannel(c.conn)
|
|
||||||
ctx, cancel = context.WithCancel(sctx)
|
|
||||||
active int
|
|
||||||
state connState = connStateIdle
|
|
||||||
responses = make(chan response)
|
|
||||||
requests = make(chan request)
|
|
||||||
recvErr = make(chan error, 1)
|
|
||||||
shutdown = c.shutdown
|
|
||||||
done = make(chan struct{})
|
|
||||||
)
|
|
||||||
|
|
||||||
defer c.conn.Close()
|
|
||||||
defer cancel()
|
|
||||||
defer close(done)
|
|
||||||
|
|
||||||
go func(recvErr chan error) {
|
|
||||||
defer close(recvErr)
|
|
||||||
sendImmediate := func(id uint32, st *status.Status) bool {
|
|
||||||
select {
|
|
||||||
case responses <- response{
|
|
||||||
// even though we've had an invalid stream id, we send it
|
|
||||||
// back on the same stream id so the client knows which
|
|
||||||
// stream id was bad.
|
|
||||||
id: id,
|
|
||||||
resp: &Response{
|
|
||||||
Status: st.Proto(),
|
|
||||||
},
|
|
||||||
}:
|
|
||||||
return true
|
|
||||||
case <-c.shutdown:
|
|
||||||
return false
|
|
||||||
case <-done:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-c.shutdown:
|
|
||||||
return
|
|
||||||
case <-done:
|
|
||||||
return
|
|
||||||
default: // proceed
|
|
||||||
}
|
|
||||||
|
|
||||||
mh, p, err := ch.recv()
|
|
||||||
if err != nil {
|
|
||||||
status, ok := status.FromError(err)
|
|
||||||
if !ok {
|
|
||||||
recvErr <- err
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// in this case, we send an error for that particular message
|
|
||||||
// when the status is defined.
|
|
||||||
if !sendImmediate(mh.StreamID, status) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if mh.Type != messageTypeRequest {
|
|
||||||
// we must ignore this for future compat.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var req Request
|
|
||||||
if err := c.server.codec.Unmarshal(p, &req); err != nil {
|
|
||||||
ch.putmbuf(p)
|
|
||||||
if !sendImmediate(mh.StreamID, status.Newf(codes.InvalidArgument, "unmarshal request error: %v", err)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
ch.putmbuf(p)
|
|
||||||
|
|
||||||
if mh.StreamID%2 != 1 {
|
|
||||||
// enforce odd client initiated identifiers.
|
|
||||||
if !sendImmediate(mh.StreamID, status.Newf(codes.InvalidArgument, "StreamID must be odd for client initiated streams")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Forward the request to the main loop. We don't wait on s.done
|
|
||||||
// because we have already accepted the client request.
|
|
||||||
select {
|
|
||||||
case requests <- request{
|
|
||||||
id: mh.StreamID,
|
|
||||||
req: &req,
|
|
||||||
}:
|
|
||||||
case <-done:
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}(recvErr)
|
|
||||||
|
|
||||||
for {
|
|
||||||
newstate := state
|
|
||||||
switch {
|
|
||||||
case active > 0:
|
|
||||||
newstate = connStateActive
|
|
||||||
shutdown = nil
|
|
||||||
case active == 0:
|
|
||||||
newstate = connStateIdle
|
|
||||||
shutdown = c.shutdown // only enable this branch in idle mode
|
|
||||||
}
|
|
||||||
|
|
||||||
if newstate != state {
|
|
||||||
c.setState(newstate)
|
|
||||||
state = newstate
|
|
||||||
}
|
|
||||||
|
|
||||||
select {
|
|
||||||
case request := <-requests:
|
|
||||||
active++
|
|
||||||
go func(id uint32) {
|
|
||||||
ctx, cancel := getRequestContext(ctx, request.req)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
p, status := c.server.services.call(ctx, request.req.Service, request.req.Method, request.req.Payload)
|
|
||||||
resp := &Response{
|
|
||||||
Status: status.Proto(),
|
|
||||||
Payload: p,
|
|
||||||
}
|
|
||||||
|
|
||||||
select {
|
|
||||||
case responses <- response{
|
|
||||||
id: id,
|
|
||||||
resp: resp,
|
|
||||||
}:
|
|
||||||
case <-done:
|
|
||||||
}
|
|
||||||
}(request.id)
|
|
||||||
case response := <-responses:
|
|
||||||
p, err := c.server.codec.Marshal(response.resp)
|
|
||||||
if err != nil {
|
|
||||||
logrus.WithError(err).Error("failed marshaling response")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ch.send(response.id, messageTypeResponse, p); err != nil {
|
|
||||||
logrus.WithError(err).Error("failed sending message on channel")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
active--
|
|
||||||
case err := <-recvErr:
|
|
||||||
// TODO(stevvooe): Not wildly clear what we should do in this
|
|
||||||
// branch. Basically, it means that we are no longer receiving
|
|
||||||
// requests due to a terminal error.
|
|
||||||
recvErr = nil // connection is now "closing"
|
|
||||||
if err == io.EOF || err == io.ErrUnexpectedEOF {
|
|
||||||
// The client went away and we should stop processing
|
|
||||||
// requests, so that the client connection is closed
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
logrus.WithError(err).Error("error receiving message")
|
|
||||||
}
|
|
||||||
case <-shutdown:
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var noopFunc = func() {}
|
|
||||||
|
|
||||||
func getRequestContext(ctx context.Context, req *Request) (retCtx context.Context, cancel func()) {
|
|
||||||
if len(req.Metadata) > 0 {
|
|
||||||
md := MD{}
|
|
||||||
md.fromRequest(req)
|
|
||||||
ctx = WithMetadata(ctx, md)
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel = noopFunc
|
|
||||||
if req.TimeoutNano == 0 {
|
|
||||||
return ctx, cancel
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, time.Duration(req.TimeoutNano))
|
|
||||||
return ctx, cancel
|
|
||||||
}
|
|
|
@ -1,156 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"path"
|
|
||||||
|
|
||||||
"github.com/gogo/protobuf/proto"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"google.golang.org/grpc/codes"
|
|
||||||
"google.golang.org/grpc/status"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Method func(ctx context.Context, unmarshal func(interface{}) error) (interface{}, error)
|
|
||||||
|
|
||||||
type ServiceDesc struct {
|
|
||||||
Methods map[string]Method
|
|
||||||
|
|
||||||
// TODO(stevvooe): Add stream support.
|
|
||||||
}
|
|
||||||
|
|
||||||
type serviceSet struct {
|
|
||||||
services map[string]ServiceDesc
|
|
||||||
interceptor UnaryServerInterceptor
|
|
||||||
}
|
|
||||||
|
|
||||||
func newServiceSet(interceptor UnaryServerInterceptor) *serviceSet {
|
|
||||||
return &serviceSet{
|
|
||||||
services: make(map[string]ServiceDesc),
|
|
||||||
interceptor: interceptor,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *serviceSet) register(name string, methods map[string]Method) {
|
|
||||||
if _, ok := s.services[name]; ok {
|
|
||||||
panic(errors.Errorf("duplicate service %v registered", name))
|
|
||||||
}
|
|
||||||
|
|
||||||
s.services[name] = ServiceDesc{
|
|
||||||
Methods: methods,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *serviceSet) call(ctx context.Context, serviceName, methodName string, p []byte) ([]byte, *status.Status) {
|
|
||||||
p, err := s.dispatch(ctx, serviceName, methodName, p)
|
|
||||||
st, ok := status.FromError(err)
|
|
||||||
if !ok {
|
|
||||||
st = status.New(convertCode(err), err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
return p, st
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *serviceSet) dispatch(ctx context.Context, serviceName, methodName string, p []byte) ([]byte, error) {
|
|
||||||
method, err := s.resolve(serviceName, methodName)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
unmarshal := func(obj interface{}) error {
|
|
||||||
switch v := obj.(type) {
|
|
||||||
case proto.Message:
|
|
||||||
if err := proto.Unmarshal(p, v); err != nil {
|
|
||||||
return status.Errorf(codes.Internal, "ttrpc: error unmarshalling payload: %v", err.Error())
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
return status.Errorf(codes.Internal, "ttrpc: error unsupported request type: %T", v)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
info := &UnaryServerInfo{
|
|
||||||
FullMethod: fullPath(serviceName, methodName),
|
|
||||||
}
|
|
||||||
|
|
||||||
resp, err := s.interceptor(ctx, unmarshal, info, method)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
switch v := resp.(type) {
|
|
||||||
case proto.Message:
|
|
||||||
r, err := proto.Marshal(v)
|
|
||||||
if err != nil {
|
|
||||||
return nil, status.Errorf(codes.Internal, "ttrpc: error marshaling payload: %v", err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
return r, nil
|
|
||||||
default:
|
|
||||||
return nil, status.Errorf(codes.Internal, "ttrpc: error unsupported response type: %T", v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *serviceSet) resolve(service, method string) (Method, error) {
|
|
||||||
srv, ok := s.services[service]
|
|
||||||
if !ok {
|
|
||||||
return nil, status.Errorf(codes.NotFound, "service %v", service)
|
|
||||||
}
|
|
||||||
|
|
||||||
mthd, ok := srv.Methods[method]
|
|
||||||
if !ok {
|
|
||||||
return nil, status.Errorf(codes.NotFound, "method %v", method)
|
|
||||||
}
|
|
||||||
|
|
||||||
return mthd, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// convertCode maps stdlib go errors into grpc space.
|
|
||||||
//
|
|
||||||
// This is ripped from the grpc-go code base.
|
|
||||||
func convertCode(err error) codes.Code {
|
|
||||||
switch err {
|
|
||||||
case nil:
|
|
||||||
return codes.OK
|
|
||||||
case io.EOF:
|
|
||||||
return codes.OutOfRange
|
|
||||||
case io.ErrClosedPipe, io.ErrNoProgress, io.ErrShortBuffer, io.ErrShortWrite, io.ErrUnexpectedEOF:
|
|
||||||
return codes.FailedPrecondition
|
|
||||||
case os.ErrInvalid:
|
|
||||||
return codes.InvalidArgument
|
|
||||||
case context.Canceled:
|
|
||||||
return codes.Canceled
|
|
||||||
case context.DeadlineExceeded:
|
|
||||||
return codes.DeadlineExceeded
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case os.IsExist(err):
|
|
||||||
return codes.AlreadyExists
|
|
||||||
case os.IsNotExist(err):
|
|
||||||
return codes.NotFound
|
|
||||||
case os.IsPermission(err):
|
|
||||||
return codes.PermissionDenied
|
|
||||||
}
|
|
||||||
return codes.Unknown
|
|
||||||
}
|
|
||||||
|
|
||||||
func fullPath(service, method string) string {
|
|
||||||
return "/" + path.Join(service, method)
|
|
||||||
}
|
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
spb "google.golang.org/genproto/googleapis/rpc/status"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Request struct {
|
|
||||||
Service string `protobuf:"bytes,1,opt,name=service,proto3"`
|
|
||||||
Method string `protobuf:"bytes,2,opt,name=method,proto3"`
|
|
||||||
Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3"`
|
|
||||||
TimeoutNano int64 `protobuf:"varint,4,opt,name=timeout_nano,proto3"`
|
|
||||||
Metadata []*KeyValue `protobuf:"bytes,5,rep,name=metadata,proto3"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Request) Reset() { *r = Request{} }
|
|
||||||
func (r *Request) String() string { return fmt.Sprintf("%+#v", r) }
|
|
||||||
func (r *Request) ProtoMessage() {}
|
|
||||||
|
|
||||||
type Response struct {
|
|
||||||
Status *spb.Status `protobuf:"bytes,1,opt,name=status,proto3"`
|
|
||||||
Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *Response) Reset() { *r = Response{} }
|
|
||||||
func (r *Response) String() string { return fmt.Sprintf("%+#v", r) }
|
|
||||||
func (r *Response) ProtoMessage() {}
|
|
||||||
|
|
||||||
type StringList struct {
|
|
||||||
List []string `protobuf:"bytes,1,rep,name=list,proto3"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *StringList) Reset() { *r = StringList{} }
|
|
||||||
func (r *StringList) String() string { return fmt.Sprintf("%+#v", r) }
|
|
||||||
func (r *StringList) ProtoMessage() {}
|
|
||||||
|
|
||||||
func makeStringList(item ...string) StringList { return StringList{List: item} }
|
|
||||||
|
|
||||||
type KeyValue struct {
|
|
||||||
Key string `protobuf:"bytes,1,opt,name=key,proto3"`
|
|
||||||
Value string `protobuf:"bytes,2,opt,name=value,proto3"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *KeyValue) Reset() { *m = KeyValue{} }
|
|
||||||
func (*KeyValue) ProtoMessage() {}
|
|
||||||
func (m *KeyValue) String() string { return fmt.Sprintf("%+#v", m) }
|
|
|
@ -1,108 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright The containerd Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package ttrpc
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
"syscall"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
"golang.org/x/sys/unix"
|
|
||||||
)
|
|
||||||
|
|
||||||
type UnixCredentialsFunc func(*unix.Ucred) error
|
|
||||||
|
|
||||||
func (fn UnixCredentialsFunc) Handshake(ctx context.Context, conn net.Conn) (net.Conn, interface{}, error) {
|
|
||||||
uc, err := requireUnixSocket(conn)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, errors.Wrap(err, "ttrpc.UnixCredentialsFunc: require unix socket")
|
|
||||||
}
|
|
||||||
|
|
||||||
rs, err := uc.SyscallConn()
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, errors.Wrap(err, "ttrpc.UnixCredentialsFunc: (net.UnixConn).SyscallConn failed")
|
|
||||||
}
|
|
||||||
var (
|
|
||||||
ucred *unix.Ucred
|
|
||||||
ucredErr error
|
|
||||||
)
|
|
||||||
if err := rs.Control(func(fd uintptr) {
|
|
||||||
ucred, ucredErr = unix.GetsockoptUcred(int(fd), unix.SOL_SOCKET, unix.SO_PEERCRED)
|
|
||||||
}); err != nil {
|
|
||||||
return nil, nil, errors.Wrapf(err, "ttrpc.UnixCredentialsFunc: (*syscall.RawConn).Control failed")
|
|
||||||
}
|
|
||||||
|
|
||||||
if ucredErr != nil {
|
|
||||||
return nil, nil, errors.Wrapf(err, "ttrpc.UnixCredentialsFunc: failed to retrieve socket peer credentials")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := fn(ucred); err != nil {
|
|
||||||
return nil, nil, errors.Wrapf(err, "ttrpc.UnixCredentialsFunc: credential check failed")
|
|
||||||
}
|
|
||||||
|
|
||||||
return uc, ucred, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnixSocketRequireUidGid requires specific *effective* UID/GID, rather than the real UID/GID.
|
|
||||||
//
|
|
||||||
// For example, if a daemon binary is owned by the root (UID 0) with SUID bit but running as an
|
|
||||||
// unprivileged user (UID 1001), the effective UID becomes 0, and the real UID becomes 1001.
|
|
||||||
// So calling this function with uid=0 allows a connection from effective UID 0 but rejects
|
|
||||||
// a connection from effective UID 1001.
|
|
||||||
//
|
|
||||||
// See socket(7), SO_PEERCRED: "The returned credentials are those that were in effect at the time of the call to connect(2) or socketpair(2)."
|
|
||||||
func UnixSocketRequireUidGid(uid, gid int) UnixCredentialsFunc {
|
|
||||||
return func(ucred *unix.Ucred) error {
|
|
||||||
return requireUidGid(ucred, uid, gid)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func UnixSocketRequireRoot() UnixCredentialsFunc {
|
|
||||||
return UnixSocketRequireUidGid(0, 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnixSocketRequireSameUser resolves the current effective unix user and returns a
|
|
||||||
// UnixCredentialsFunc that will validate incoming unix connections against the
|
|
||||||
// current credentials.
|
|
||||||
//
|
|
||||||
// This is useful when using abstract sockets that are accessible by all users.
|
|
||||||
func UnixSocketRequireSameUser() UnixCredentialsFunc {
|
|
||||||
euid, egid := os.Geteuid(), os.Getegid()
|
|
||||||
return UnixSocketRequireUidGid(euid, egid)
|
|
||||||
}
|
|
||||||
|
|
||||||
func requireRoot(ucred *unix.Ucred) error {
|
|
||||||
return requireUidGid(ucred, 0, 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func requireUidGid(ucred *unix.Ucred, uid, gid int) error {
|
|
||||||
if (uid != -1 && uint32(uid) != ucred.Uid) || (gid != -1 && uint32(gid) != ucred.Gid) {
|
|
||||||
return errors.Wrap(syscall.EPERM, "ttrpc: invalid credentials")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func requireUnixSocket(conn net.Conn) (*net.UnixConn, error) {
|
|
||||||
uc, ok := conn.(*net.UnixConn)
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("a unix socket connection is required")
|
|
||||||
}
|
|
||||||
|
|
||||||
return uc, nil
|
|
||||||
}
|
|
|
@ -45,7 +45,7 @@ You don't need to read this document unless you want to use the full-featured st
|
||||||
- [Building a Dockerfile using external frontend:](#building-a-dockerfile-using-external-frontend)
|
- [Building a Dockerfile using external frontend:](#building-a-dockerfile-using-external-frontend)
|
||||||
- [Building a Dockerfile with experimental features like `RUN --mount=type=(bind|cache|tmpfs|secret|ssh)`](#building-a-dockerfile-with-experimental-features-like-run---mounttypebindcachetmpfssecretssh)
|
- [Building a Dockerfile with experimental features like `RUN --mount=type=(bind|cache|tmpfs|secret|ssh)`](#building-a-dockerfile-with-experimental-features-like-run---mounttypebindcachetmpfssecretssh)
|
||||||
- [Output](#output)
|
- [Output](#output)
|
||||||
- [Registry](#registry)
|
- [Image/Registry](#imageregistry)
|
||||||
- [Local directory](#local-directory)
|
- [Local directory](#local-directory)
|
||||||
- [Docker tarball](#docker-tarball)
|
- [Docker tarball](#docker-tarball)
|
||||||
- [OCI tarball](#oci-tarball)
|
- [OCI tarball](#oci-tarball)
|
||||||
|
@ -85,6 +85,7 @@ BuildKit is used by the following projects:
|
||||||
- [Rio](https://github.com/rancher/rio)
|
- [Rio](https://github.com/rancher/rio)
|
||||||
- [PouchContainer](https://github.com/alibaba/pouch)
|
- [PouchContainer](https://github.com/alibaba/pouch)
|
||||||
- [Docker buildx](https://github.com/docker/buildx)
|
- [Docker buildx](https://github.com/docker/buildx)
|
||||||
|
- [Okteto Cloud](https://okteto.com/)
|
||||||
|
|
||||||
## Quick start
|
## Quick start
|
||||||
|
|
||||||
|
@ -94,7 +95,7 @@ BuildKit is composed of the `buildkitd` daemon and the `buildctl` client.
|
||||||
While the `buildctl` client is available for Linux, macOS, and Windows, the `buildkitd` daemon is only available for Linux currently.
|
While the `buildctl` client is available for Linux, macOS, and Windows, the `buildkitd` daemon is only available for Linux currently.
|
||||||
|
|
||||||
The `buildkitd` daemon requires the following components to be installed:
|
The `buildkitd` daemon requires the following components to be installed:
|
||||||
- [runc](https://github.com/opencontainers/runc)
|
- [runc](https://github.com/opencontainers/runc) or [crun](https://github.com/containers/crun)
|
||||||
- [containerd](https://github.com/containerd/containerd) (if you want to use containerd worker)
|
- [containerd](https://github.com/containerd/containerd) (if you want to use containerd worker)
|
||||||
|
|
||||||
The latest binaries of BuildKit are available [here](https://github.com/moby/buildkit/releases) for Linux, macOS, and Windows.
|
The latest binaries of BuildKit are available [here](https://github.com/moby/buildkit/releases) for Linux, macOS, and Windows.
|
||||||
|
@ -125,6 +126,11 @@ We are open to adding more backends.
|
||||||
The buildkitd daemon listens gRPC API on `/run/buildkit/buildkitd.sock` by default, but you can also use TCP sockets.
|
The buildkitd daemon listens gRPC API on `/run/buildkit/buildkitd.sock` by default, but you can also use TCP sockets.
|
||||||
See [Expose BuildKit as a TCP service](#expose-buildkit-as-a-tcp-service).
|
See [Expose BuildKit as a TCP service](#expose-buildkit-as-a-tcp-service).
|
||||||
|
|
||||||
|
:information_source: Notice to Fedora 31 users:
|
||||||
|
|
||||||
|
* As runc still does not work on cgroup v2 environment like Fedora 31, you need to substitute runc with crun. Run `buildkitd` with `--oci-worker-binary=crun`.
|
||||||
|
* If you want to use runc, you need to configure the system to use cgroup v1. Run `sudo grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"` and reboot.
|
||||||
|
|
||||||
### Exploring LLB
|
### Exploring LLB
|
||||||
|
|
||||||
BuildKit builds are based on a binary intermediate format called LLB that is used for defining the dependency graph for processes running part of your build. tl;dr: LLB is to Dockerfile what LLVM IR is to C.
|
BuildKit builds are based on a binary intermediate format called LLB that is used for defining the dependency graph for processes running part of your build. tl;dr: LLB is to Dockerfile what LLVM IR is to C.
|
||||||
|
@ -193,14 +199,14 @@ See [`frontend/dockerfile/docs/experimental.md`](frontend/dockerfile/docs/experi
|
||||||
|
|
||||||
By default, the build result and intermediate cache will only remain internally in BuildKit. An output needs to be specified to retrieve the result.
|
By default, the build result and intermediate cache will only remain internally in BuildKit. An output needs to be specified to retrieve the result.
|
||||||
|
|
||||||
#### Registry
|
#### Image/Registry
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
buildctl build ... --output type=image,name=docker.io/username/image,push=true
|
buildctl build ... --output type=image,name=docker.io/username/image,push=true
|
||||||
```
|
```
|
||||||
|
|
||||||
To export and import the cache along with the image, you need to specify `--export-cache type=inline` and `--import-cache type=registry,ref=...`.
|
To export the cache embed with the image and pushing them to registry together, type `registry` is required to import the cache, you should specify `--export-cache type=inline` and `--import-cache type=registry,ref=...`. To export the cache to a local directy, you should specify `--export-cache type=local`.
|
||||||
See [Export cache](#export-cache).
|
Details in [Export cache](#export-cache).
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
buildctl build ...\
|
buildctl build ...\
|
||||||
|
@ -209,6 +215,18 @@ buildctl build ...\
|
||||||
--import-cache type=registry,ref=docker.io/username/image
|
--import-cache type=registry,ref=docker.io/username/image
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Keys supported by image output:
|
||||||
|
* `name=[value]`: image name
|
||||||
|
* `push=true`: push after creating the image
|
||||||
|
* `push-by-digest=true`: push unnamed image
|
||||||
|
* `registry.insecure=true`: push to insecure HTTP registry
|
||||||
|
* `oci-mediatypes=true`: use OCI mediatypes in configuration JSON instead of Docker's
|
||||||
|
* `unpack=true`: unpack image after creation (for use with containerd)
|
||||||
|
* `dangling-name-prefix=[value]`: name image with `prefix@<digest>` , used for anonymous images
|
||||||
|
* `name-canonical=true`: add additional canonical name `name@<digest>`
|
||||||
|
* `compression=[uncompressed,gzip]`: choose compression type for layer, gzip is default value
|
||||||
|
|
||||||
|
|
||||||
If credentials are required, `buildctl` will attempt to read Docker configuration file `$DOCKER_CONFIG/config.json`.
|
If credentials are required, `buildctl` will attempt to read Docker configuration file `$DOCKER_CONFIG/config.json`.
|
||||||
`$DOCKER_CONFIG` defaults to `~/.docker`.
|
`$DOCKER_CONFIG` defaults to `~/.docker`.
|
||||||
|
|
||||||
|
@ -322,14 +340,11 @@ buildctl build ... \
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
buildctl build ... --export-cache type=local,dest=path/to/output-dir
|
buildctl build ... --export-cache type=local,dest=path/to/output-dir
|
||||||
buildctl build ... --import-cache type=local,src=path/to/input-dir,digest=sha256:deadbeef
|
buildctl build ... --import-cache type=local,src=path/to/input-dir
|
||||||
```
|
```
|
||||||
|
|
||||||
The directory layout conforms to OCI Image Spec v1.0.
|
The directory layout conforms to OCI Image Spec v1.0.
|
||||||
|
|
||||||
Currently, you need to specify the `digest` of the manifest list to import for `local` cache importer.
|
|
||||||
This is planned to default to the digest of "latest" tag in `index.json` in future.
|
|
||||||
|
|
||||||
#### `--export-cache` options
|
#### `--export-cache` options
|
||||||
- `type`: `inline`, `registry`, or `local`
|
- `type`: `inline`, `registry`, or `local`
|
||||||
- `mode=min` (default): only export layers for the resulting image
|
- `mode=min` (default): only export layers for the resulting image
|
||||||
|
@ -342,6 +357,8 @@ This is planned to default to the digest of "latest" tag in `index.json` in futu
|
||||||
- `ref=docker.io/user/image:tag`: reference for `registry` cache importer
|
- `ref=docker.io/user/image:tag`: reference for `registry` cache importer
|
||||||
- `src=path/to/input-dir`: directory for `local` cache importer
|
- `src=path/to/input-dir`: directory for `local` cache importer
|
||||||
- `digest=sha256:deadbeef`: digest of the manifest list to import for `local` cache importer.
|
- `digest=sha256:deadbeef`: digest of the manifest list to import for `local` cache importer.
|
||||||
|
- `tag=customtag`: custom tag of image for `local` cache importer.
|
||||||
|
Defaults to the digest of "latest" tag in `index.json` is for digest, not for tag
|
||||||
|
|
||||||
### Consistent hashing
|
### Consistent hashing
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -63,6 +63,7 @@ message SolveRequest {
|
||||||
map<string, string> FrontendAttrs = 7;
|
map<string, string> FrontendAttrs = 7;
|
||||||
CacheOptions Cache = 8 [(gogoproto.nullable) = false];
|
CacheOptions Cache = 8 [(gogoproto.nullable) = false];
|
||||||
repeated string Entitlements = 9 [(gogoproto.customtype) = "github.com/moby/buildkit/util/entitlements.Entitlement" ];
|
repeated string Entitlements = 9 [(gogoproto.customtype) = "github.com/moby/buildkit/util/entitlements.Entitlement" ];
|
||||||
|
map<string, pb.Definition> FrontendInputs = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
message CacheOptions {
|
message CacheOptions {
|
||||||
|
|
|
@ -3,13 +3,15 @@
|
||||||
|
|
||||||
package moby_buildkit_v1_types
|
package moby_buildkit_v1_types
|
||||||
|
|
||||||
import proto "github.com/gogo/protobuf/proto"
|
import (
|
||||||
import fmt "fmt"
|
fmt "fmt"
|
||||||
import math "math"
|
_ "github.com/gogo/protobuf/gogoproto"
|
||||||
import _ "github.com/gogo/protobuf/gogoproto"
|
proto "github.com/gogo/protobuf/proto"
|
||||||
import pb "github.com/moby/buildkit/solver/pb"
|
pb "github.com/moby/buildkit/solver/pb"
|
||||||
|
io "io"
|
||||||
import io "io"
|
math "math"
|
||||||
|
math_bits "math/bits"
|
||||||
|
)
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
|
@ -20,7 +22,7 @@ var _ = math.Inf
|
||||||
// is compatible with the proto package it is being compiled against.
|
// is compatible with the proto package it is being compiled against.
|
||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
type WorkerRecord struct {
|
type WorkerRecord struct {
|
||||||
ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
|
ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
|
||||||
|
@ -36,7 +38,7 @@ func (m *WorkerRecord) Reset() { *m = WorkerRecord{} }
|
||||||
func (m *WorkerRecord) String() string { return proto.CompactTextString(m) }
|
func (m *WorkerRecord) String() string { return proto.CompactTextString(m) }
|
||||||
func (*WorkerRecord) ProtoMessage() {}
|
func (*WorkerRecord) ProtoMessage() {}
|
||||||
func (*WorkerRecord) Descriptor() ([]byte, []int) {
|
func (*WorkerRecord) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_worker_1d0a62be5114ecbf, []int{0}
|
return fileDescriptor_e4ff6184b07e587a, []int{0}
|
||||||
}
|
}
|
||||||
func (m *WorkerRecord) XXX_Unmarshal(b []byte) error {
|
func (m *WorkerRecord) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -46,15 +48,15 @@ func (m *WorkerRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
|
||||||
return xxx_messageInfo_WorkerRecord.Marshal(b, m, deterministic)
|
return xxx_messageInfo_WorkerRecord.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *WorkerRecord) XXX_Merge(src proto.Message) {
|
func (m *WorkerRecord) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_WorkerRecord.Merge(dst, src)
|
xxx_messageInfo_WorkerRecord.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *WorkerRecord) XXX_Size() int {
|
func (m *WorkerRecord) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -107,7 +109,7 @@ func (m *GCPolicy) Reset() { *m = GCPolicy{} }
|
||||||
func (m *GCPolicy) String() string { return proto.CompactTextString(m) }
|
func (m *GCPolicy) String() string { return proto.CompactTextString(m) }
|
||||||
func (*GCPolicy) ProtoMessage() {}
|
func (*GCPolicy) ProtoMessage() {}
|
||||||
func (*GCPolicy) Descriptor() ([]byte, []int) {
|
func (*GCPolicy) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_worker_1d0a62be5114ecbf, []int{1}
|
return fileDescriptor_e4ff6184b07e587a, []int{1}
|
||||||
}
|
}
|
||||||
func (m *GCPolicy) XXX_Unmarshal(b []byte) error {
|
func (m *GCPolicy) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -117,15 +119,15 @@ func (m *GCPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||||
return xxx_messageInfo_GCPolicy.Marshal(b, m, deterministic)
|
return xxx_messageInfo_GCPolicy.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *GCPolicy) XXX_Merge(src proto.Message) {
|
func (m *GCPolicy) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_GCPolicy.Merge(dst, src)
|
xxx_messageInfo_GCPolicy.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *GCPolicy) XXX_Size() int {
|
func (m *GCPolicy) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -169,10 +171,40 @@ func init() {
|
||||||
proto.RegisterMapType((map[string]string)(nil), "moby.buildkit.v1.types.WorkerRecord.LabelsEntry")
|
proto.RegisterMapType((map[string]string)(nil), "moby.buildkit.v1.types.WorkerRecord.LabelsEntry")
|
||||||
proto.RegisterType((*GCPolicy)(nil), "moby.buildkit.v1.types.GCPolicy")
|
proto.RegisterType((*GCPolicy)(nil), "moby.buildkit.v1.types.GCPolicy")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() { proto.RegisterFile("worker.proto", fileDescriptor_e4ff6184b07e587a) }
|
||||||
|
|
||||||
|
var fileDescriptor_e4ff6184b07e587a = []byte{
|
||||||
|
// 355 bytes of a gzipped FileDescriptorProto
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4e, 0xea, 0x40,
|
||||||
|
0x14, 0x86, 0x6f, 0x5b, 0x2e, 0x97, 0x0e, 0xcd, 0x8d, 0x99, 0x18, 0xd3, 0x10, 0x83, 0x84, 0x15,
|
||||||
|
0x0b, 0x9d, 0xa2, 0x6e, 0xd4, 0xb8, 0x42, 0x8c, 0x92, 0xb8, 0x20, 0xb3, 0x71, 0xdd, 0x81, 0x01,
|
||||||
|
0x9b, 0x0e, 0x9c, 0xc9, 0x74, 0x8a, 0xf6, 0x39, 0x7c, 0x29, 0x96, 0x3e, 0x81, 0x31, 0x3c, 0x89,
|
||||||
|
0x99, 0x29, 0x08, 0x26, 0xba, 0x3b, 0xff, 0x9f, 0xff, 0xfb, 0xe7, 0x9c, 0x0c, 0x0a, 0x9e, 0x41,
|
||||||
|
0xa5, 0x5c, 0x11, 0xa9, 0x40, 0x03, 0x3e, 0x98, 0x01, 0x2b, 0x08, 0xcb, 0x13, 0x31, 0x4e, 0x13,
|
||||||
|
0x4d, 0x16, 0xa7, 0x44, 0x17, 0x92, 0x67, 0x8d, 0x93, 0x69, 0xa2, 0x9f, 0x72, 0x46, 0x46, 0x30,
|
||||||
|
0x8b, 0xa6, 0x30, 0x85, 0xc8, 0xc6, 0x59, 0x3e, 0xb1, 0xca, 0x0a, 0x3b, 0x95, 0x35, 0x8d, 0xe3,
|
||||||
|
0x9d, 0xb8, 0x69, 0x8c, 0x36, 0x8d, 0x51, 0x06, 0x62, 0xc1, 0x55, 0x24, 0x59, 0x04, 0x32, 0x2b,
|
||||||
|
0xd3, 0xed, 0x57, 0x17, 0x05, 0x8f, 0x76, 0x0b, 0xca, 0x47, 0xa0, 0xc6, 0xf8, 0x3f, 0x72, 0x07,
|
||||||
|
0xfd, 0xd0, 0x69, 0x39, 0x1d, 0x9f, 0xba, 0x83, 0x3e, 0xbe, 0x47, 0xd5, 0x87, 0x98, 0x71, 0x91,
|
||||||
|
0x85, 0x6e, 0xcb, 0xeb, 0xd4, 0xcf, 0xba, 0xe4, 0xe7, 0x35, 0xc9, 0x6e, 0x0b, 0x29, 0x91, 0xdb,
|
||||||
|
0xb9, 0x56, 0x05, 0x5d, 0xf3, 0xb8, 0x8b, 0x7c, 0x29, 0x62, 0x3d, 0x01, 0x35, 0xcb, 0x42, 0xcf,
|
||||||
|
0x96, 0x05, 0x44, 0x32, 0x32, 0x5c, 0x9b, 0xbd, 0xca, 0xf2, 0xfd, 0xe8, 0x0f, 0xdd, 0x86, 0xf0,
|
||||||
|
0x35, 0xaa, 0xdd, 0xdd, 0x0c, 0x41, 0x24, 0xa3, 0x22, 0xac, 0x58, 0xa0, 0xf5, 0xdb, 0xeb, 0x9b,
|
||||||
|
0x1c, 0xfd, 0x22, 0x1a, 0x97, 0xa8, 0xbe, 0xb3, 0x06, 0xde, 0x43, 0x5e, 0xca, 0x8b, 0xf5, 0x65,
|
||||||
|
0x66, 0xc4, 0xfb, 0xe8, 0xef, 0x22, 0x16, 0x39, 0x0f, 0x5d, 0xeb, 0x95, 0xe2, 0xca, 0xbd, 0x70,
|
||||||
|
0xda, 0x2f, 0xdb, 0x87, 0x0d, 0x17, 0x0b, 0x61, 0xb9, 0x1a, 0x35, 0x23, 0x6e, 0xa3, 0x20, 0xe5,
|
||||||
|
0x5c, 0xf6, 0x73, 0x15, 0xeb, 0x04, 0xe6, 0x16, 0xf7, 0xe8, 0x37, 0x0f, 0x1f, 0x22, 0xdf, 0xe8,
|
||||||
|
0x5e, 0xa1, 0xb9, 0x39, 0xd6, 0x04, 0xb6, 0x06, 0x0e, 0xd1, 0xbf, 0x49, 0x22, 0x34, 0x57, 0x99,
|
||||||
|
0xbd, 0xcb, 0xa7, 0x1b, 0xd9, 0x0b, 0x96, 0xab, 0xa6, 0xf3, 0xb6, 0x6a, 0x3a, 0x1f, 0xab, 0xa6,
|
||||||
|
0xc3, 0xaa, 0xf6, 0x93, 0xce, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x79, 0x52, 0x6a, 0x29,
|
||||||
|
0x02, 0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
func (m *WorkerRecord) Marshal() (dAtA []byte, err error) {
|
func (m *WorkerRecord) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -180,67 +212,80 @@ func (m *WorkerRecord) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *WorkerRecord) MarshalTo(dAtA []byte) (int, error) {
|
func (m *WorkerRecord) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *WorkerRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.ID) > 0 {
|
if m.XXX_unrecognized != nil {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.XXX_unrecognized)
|
||||||
i++
|
copy(dAtA[i:], m.XXX_unrecognized)
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(len(m.ID)))
|
|
||||||
i += copy(dAtA[i:], m.ID)
|
|
||||||
}
|
}
|
||||||
if len(m.Labels) > 0 {
|
if len(m.GCPolicy) > 0 {
|
||||||
for k, _ := range m.Labels {
|
for iNdEx := len(m.GCPolicy) - 1; iNdEx >= 0; iNdEx-- {
|
||||||
dAtA[i] = 0x12
|
{
|
||||||
i++
|
size, err := m.GCPolicy[iNdEx].MarshalToSizedBuffer(dAtA[:i])
|
||||||
v := m.Labels[k]
|
if err != nil {
|
||||||
mapSize := 1 + len(k) + sovWorker(uint64(len(k))) + 1 + len(v) + sovWorker(uint64(len(v)))
|
return 0, err
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(mapSize))
|
}
|
||||||
dAtA[i] = 0xa
|
i -= size
|
||||||
i++
|
i = encodeVarintWorker(dAtA, i, uint64(size))
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(len(k)))
|
}
|
||||||
i += copy(dAtA[i:], k)
|
i--
|
||||||
dAtA[i] = 0x12
|
dAtA[i] = 0x22
|
||||||
i++
|
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(len(v)))
|
|
||||||
i += copy(dAtA[i:], v)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(m.Platforms) > 0 {
|
if len(m.Platforms) > 0 {
|
||||||
for _, msg := range m.Platforms {
|
for iNdEx := len(m.Platforms) - 1; iNdEx >= 0; iNdEx-- {
|
||||||
|
{
|
||||||
|
size, err := m.Platforms[iNdEx].MarshalToSizedBuffer(dAtA[:i])
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
i -= size
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(size))
|
||||||
|
}
|
||||||
|
i--
|
||||||
dAtA[i] = 0x1a
|
dAtA[i] = 0x1a
|
||||||
i++
|
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(msg.Size()))
|
|
||||||
n, err := msg.MarshalTo(dAtA[i:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
i += n
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(m.GCPolicy) > 0 {
|
if len(m.Labels) > 0 {
|
||||||
for _, msg := range m.GCPolicy {
|
for k := range m.Labels {
|
||||||
dAtA[i] = 0x22
|
v := m.Labels[k]
|
||||||
i++
|
baseI := i
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(msg.Size()))
|
i -= len(v)
|
||||||
n, err := msg.MarshalTo(dAtA[i:])
|
copy(dAtA[i:], v)
|
||||||
if err != nil {
|
i = encodeVarintWorker(dAtA, i, uint64(len(v)))
|
||||||
return 0, err
|
i--
|
||||||
}
|
dAtA[i] = 0x12
|
||||||
i += n
|
i -= len(k)
|
||||||
|
copy(dAtA[i:], k)
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(len(k)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(baseI-i))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x12
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if m.XXX_unrecognized != nil {
|
if len(m.ID) > 0 {
|
||||||
i += copy(dAtA[i:], m.XXX_unrecognized)
|
i -= len(m.ID)
|
||||||
|
copy(dAtA[i:], m.ID)
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(len(m.ID)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
}
|
}
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *GCPolicy) Marshal() (dAtA []byte, err error) {
|
func (m *GCPolicy) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -248,59 +293,61 @@ func (m *GCPolicy) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *GCPolicy) MarshalTo(dAtA []byte) (int, error) {
|
func (m *GCPolicy) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *GCPolicy) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
|
if m.XXX_unrecognized != nil {
|
||||||
|
i -= len(m.XXX_unrecognized)
|
||||||
|
copy(dAtA[i:], m.XXX_unrecognized)
|
||||||
|
}
|
||||||
|
if len(m.Filters) > 0 {
|
||||||
|
for iNdEx := len(m.Filters) - 1; iNdEx >= 0; iNdEx-- {
|
||||||
|
i -= len(m.Filters[iNdEx])
|
||||||
|
copy(dAtA[i:], m.Filters[iNdEx])
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(len(m.Filters[iNdEx])))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x22
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if m.KeepBytes != 0 {
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(m.KeepBytes))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x18
|
||||||
|
}
|
||||||
|
if m.KeepDuration != 0 {
|
||||||
|
i = encodeVarintWorker(dAtA, i, uint64(m.KeepDuration))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x10
|
||||||
|
}
|
||||||
if m.All {
|
if m.All {
|
||||||
dAtA[i] = 0x8
|
i--
|
||||||
i++
|
|
||||||
if m.All {
|
if m.All {
|
||||||
dAtA[i] = 1
|
dAtA[i] = 1
|
||||||
} else {
|
} else {
|
||||||
dAtA[i] = 0
|
dAtA[i] = 0
|
||||||
}
|
}
|
||||||
i++
|
i--
|
||||||
|
dAtA[i] = 0x8
|
||||||
}
|
}
|
||||||
if m.KeepDuration != 0 {
|
return len(dAtA) - i, nil
|
||||||
dAtA[i] = 0x10
|
|
||||||
i++
|
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(m.KeepDuration))
|
|
||||||
}
|
|
||||||
if m.KeepBytes != 0 {
|
|
||||||
dAtA[i] = 0x18
|
|
||||||
i++
|
|
||||||
i = encodeVarintWorker(dAtA, i, uint64(m.KeepBytes))
|
|
||||||
}
|
|
||||||
if len(m.Filters) > 0 {
|
|
||||||
for _, s := range m.Filters {
|
|
||||||
dAtA[i] = 0x22
|
|
||||||
i++
|
|
||||||
l = len(s)
|
|
||||||
for l >= 1<<7 {
|
|
||||||
dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
|
|
||||||
l >>= 7
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
dAtA[i] = uint8(l)
|
|
||||||
i++
|
|
||||||
i += copy(dAtA[i:], s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if m.XXX_unrecognized != nil {
|
|
||||||
i += copy(dAtA[i:], m.XXX_unrecognized)
|
|
||||||
}
|
|
||||||
return i, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeVarintWorker(dAtA []byte, offset int, v uint64) int {
|
func encodeVarintWorker(dAtA []byte, offset int, v uint64) int {
|
||||||
|
offset -= sovWorker(v)
|
||||||
|
base := offset
|
||||||
for v >= 1<<7 {
|
for v >= 1<<7 {
|
||||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||||
v >>= 7
|
v >>= 7
|
||||||
offset++
|
offset++
|
||||||
}
|
}
|
||||||
dAtA[offset] = uint8(v)
|
dAtA[offset] = uint8(v)
|
||||||
return offset + 1
|
return base
|
||||||
}
|
}
|
||||||
func (m *WorkerRecord) Size() (n int) {
|
func (m *WorkerRecord) Size() (n int) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -366,14 +413,7 @@ func (m *GCPolicy) Size() (n int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sovWorker(x uint64) (n int) {
|
func sovWorker(x uint64) (n int) {
|
||||||
for {
|
return (math_bits.Len64(x|1) + 6) / 7
|
||||||
n++
|
|
||||||
x >>= 7
|
|
||||||
if x == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n
|
|
||||||
}
|
}
|
||||||
func sozWorker(x uint64) (n int) {
|
func sozWorker(x uint64) (n int) {
|
||||||
return sovWorker(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
return sovWorker(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
||||||
|
@ -393,7 +433,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -421,7 +461,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -431,6 +471,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -450,7 +493,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
msglen |= (int(b) & 0x7F) << shift
|
msglen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -459,6 +502,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + msglen
|
postIndex := iNdEx + msglen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -479,7 +525,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -496,7 +542,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLenmapkey |= (uint64(b) & 0x7F) << shift
|
stringLenmapkey |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -506,6 +552,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postStringIndexmapkey := iNdEx + intStringLenmapkey
|
postStringIndexmapkey := iNdEx + intStringLenmapkey
|
||||||
|
if postStringIndexmapkey < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postStringIndexmapkey > l {
|
if postStringIndexmapkey > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -522,7 +571,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLenmapvalue |= (uint64(b) & 0x7F) << shift
|
stringLenmapvalue |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -532,6 +581,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postStringIndexmapvalue := iNdEx + intStringLenmapvalue
|
postStringIndexmapvalue := iNdEx + intStringLenmapvalue
|
||||||
|
if postStringIndexmapvalue < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postStringIndexmapvalue > l {
|
if postStringIndexmapvalue > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -568,7 +620,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
msglen |= (int(b) & 0x7F) << shift
|
msglen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -577,6 +629,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + msglen
|
postIndex := iNdEx + msglen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -599,7 +654,7 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
msglen |= (int(b) & 0x7F) << shift
|
msglen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -608,6 +663,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + msglen
|
postIndex := iNdEx + msglen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -625,6 +683,9 @@ func (m *WorkerRecord) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -653,7 +714,7 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -681,7 +742,7 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
v |= (int(b) & 0x7F) << shift
|
v |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -701,7 +762,7 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
m.KeepDuration |= (int64(b) & 0x7F) << shift
|
m.KeepDuration |= int64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -720,7 +781,7 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
m.KeepBytes |= (int64(b) & 0x7F) << shift
|
m.KeepBytes |= int64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -739,7 +800,7 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -749,6 +810,9 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -763,6 +827,9 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthWorker
|
return ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthWorker
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -779,6 +846,7 @@ func (m *GCPolicy) Unmarshal(dAtA []byte) error {
|
||||||
func skipWorker(dAtA []byte) (n int, err error) {
|
func skipWorker(dAtA []byte) (n int, err error) {
|
||||||
l := len(dAtA)
|
l := len(dAtA)
|
||||||
iNdEx := 0
|
iNdEx := 0
|
||||||
|
depth := 0
|
||||||
for iNdEx < l {
|
for iNdEx < l {
|
||||||
var wire uint64
|
var wire uint64
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -810,10 +878,8 @@ func skipWorker(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
|
||||||
case 1:
|
case 1:
|
||||||
iNdEx += 8
|
iNdEx += 8
|
||||||
return iNdEx, nil
|
|
||||||
case 2:
|
case 2:
|
||||||
var length int
|
var length int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -830,82 +896,34 @@ func skipWorker(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
iNdEx += length
|
|
||||||
if length < 0 {
|
if length < 0 {
|
||||||
return 0, ErrInvalidLengthWorker
|
return 0, ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
iNdEx += length
|
||||||
case 3:
|
case 3:
|
||||||
for {
|
depth++
|
||||||
var innerWire uint64
|
|
||||||
var start int = iNdEx
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return 0, ErrIntOverflowWorker
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return 0, io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
innerWire |= (uint64(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
innerWireType := int(innerWire & 0x7)
|
|
||||||
if innerWireType == 4 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
next, err := skipWorker(dAtA[start:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
iNdEx = start + next
|
|
||||||
}
|
|
||||||
return iNdEx, nil
|
|
||||||
case 4:
|
case 4:
|
||||||
return iNdEx, nil
|
if depth == 0 {
|
||||||
|
return 0, ErrUnexpectedEndOfGroupWorker
|
||||||
|
}
|
||||||
|
depth--
|
||||||
case 5:
|
case 5:
|
||||||
iNdEx += 4
|
iNdEx += 4
|
||||||
return iNdEx, nil
|
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
||||||
}
|
}
|
||||||
|
if iNdEx < 0 {
|
||||||
|
return 0, ErrInvalidLengthWorker
|
||||||
}
|
}
|
||||||
panic("unreachable")
|
if depth == 0 {
|
||||||
|
return iNdEx, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrInvalidLengthWorker = fmt.Errorf("proto: negative length found during unmarshaling")
|
ErrInvalidLengthWorker = fmt.Errorf("proto: negative length found during unmarshaling")
|
||||||
ErrIntOverflowWorker = fmt.Errorf("proto: integer overflow")
|
ErrIntOverflowWorker = fmt.Errorf("proto: integer overflow")
|
||||||
|
ErrUnexpectedEndOfGroupWorker = fmt.Errorf("proto: unexpected end of group")
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() { proto.RegisterFile("worker.proto", fileDescriptor_worker_1d0a62be5114ecbf) }
|
|
||||||
|
|
||||||
var fileDescriptor_worker_1d0a62be5114ecbf = []byte{
|
|
||||||
// 355 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4e, 0xea, 0x40,
|
|
||||||
0x14, 0x86, 0x6f, 0x5b, 0x2e, 0x97, 0x0e, 0xcd, 0x8d, 0x99, 0x18, 0xd3, 0x10, 0x83, 0x84, 0x15,
|
|
||||||
0x0b, 0x9d, 0xa2, 0x6e, 0xd4, 0xb8, 0x42, 0x8c, 0x92, 0xb8, 0x20, 0xb3, 0x71, 0xdd, 0x81, 0x01,
|
|
||||||
0x9b, 0x0e, 0x9c, 0xc9, 0x74, 0x8a, 0xf6, 0x39, 0x7c, 0x29, 0x96, 0x3e, 0x81, 0x31, 0x3c, 0x89,
|
|
||||||
0x99, 0x29, 0x08, 0x26, 0xba, 0x3b, 0xff, 0x9f, 0xff, 0xfb, 0xe7, 0x9c, 0x0c, 0x0a, 0x9e, 0x41,
|
|
||||||
0xa5, 0x5c, 0x11, 0xa9, 0x40, 0x03, 0x3e, 0x98, 0x01, 0x2b, 0x08, 0xcb, 0x13, 0x31, 0x4e, 0x13,
|
|
||||||
0x4d, 0x16, 0xa7, 0x44, 0x17, 0x92, 0x67, 0x8d, 0x93, 0x69, 0xa2, 0x9f, 0x72, 0x46, 0x46, 0x30,
|
|
||||||
0x8b, 0xa6, 0x30, 0x85, 0xc8, 0xc6, 0x59, 0x3e, 0xb1, 0xca, 0x0a, 0x3b, 0x95, 0x35, 0x8d, 0xe3,
|
|
||||||
0x9d, 0xb8, 0x69, 0x8c, 0x36, 0x8d, 0x51, 0x06, 0x62, 0xc1, 0x55, 0x24, 0x59, 0x04, 0x32, 0x2b,
|
|
||||||
0xd3, 0xed, 0x57, 0x17, 0x05, 0x8f, 0x76, 0x0b, 0xca, 0x47, 0xa0, 0xc6, 0xf8, 0x3f, 0x72, 0x07,
|
|
||||||
0xfd, 0xd0, 0x69, 0x39, 0x1d, 0x9f, 0xba, 0x83, 0x3e, 0xbe, 0x47, 0xd5, 0x87, 0x98, 0x71, 0x91,
|
|
||||||
0x85, 0x6e, 0xcb, 0xeb, 0xd4, 0xcf, 0xba, 0xe4, 0xe7, 0x35, 0xc9, 0x6e, 0x0b, 0x29, 0x91, 0xdb,
|
|
||||||
0xb9, 0x56, 0x05, 0x5d, 0xf3, 0xb8, 0x8b, 0x7c, 0x29, 0x62, 0x3d, 0x01, 0x35, 0xcb, 0x42, 0xcf,
|
|
||||||
0x96, 0x05, 0x44, 0x32, 0x32, 0x5c, 0x9b, 0xbd, 0xca, 0xf2, 0xfd, 0xe8, 0x0f, 0xdd, 0x86, 0xf0,
|
|
||||||
0x35, 0xaa, 0xdd, 0xdd, 0x0c, 0x41, 0x24, 0xa3, 0x22, 0xac, 0x58, 0xa0, 0xf5, 0xdb, 0xeb, 0x9b,
|
|
||||||
0x1c, 0xfd, 0x22, 0x1a, 0x97, 0xa8, 0xbe, 0xb3, 0x06, 0xde, 0x43, 0x5e, 0xca, 0x8b, 0xf5, 0x65,
|
|
||||||
0x66, 0xc4, 0xfb, 0xe8, 0xef, 0x22, 0x16, 0x39, 0x0f, 0x5d, 0xeb, 0x95, 0xe2, 0xca, 0xbd, 0x70,
|
|
||||||
0xda, 0x2f, 0xdb, 0x87, 0x0d, 0x17, 0x0b, 0x61, 0xb9, 0x1a, 0x35, 0x23, 0x6e, 0xa3, 0x20, 0xe5,
|
|
||||||
0x5c, 0xf6, 0x73, 0x15, 0xeb, 0x04, 0xe6, 0x16, 0xf7, 0xe8, 0x37, 0x0f, 0x1f, 0x22, 0xdf, 0xe8,
|
|
||||||
0x5e, 0xa1, 0xb9, 0x39, 0xd6, 0x04, 0xb6, 0x06, 0x0e, 0xd1, 0xbf, 0x49, 0x22, 0x34, 0x57, 0x99,
|
|
||||||
0xbd, 0xcb, 0xa7, 0x1b, 0xd9, 0x0b, 0x96, 0xab, 0xa6, 0xf3, 0xb6, 0x6a, 0x3a, 0x1f, 0xab, 0xa6,
|
|
||||||
0xc3, 0xaa, 0xf6, 0x93, 0xce, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x79, 0x52, 0x6a, 0x29,
|
|
||||||
0x02, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
|
|
|
@ -103,3 +103,8 @@ func (g *gatewayClientForBuild) Return(ctx context.Context, in *gatewayapi.Retur
|
||||||
ctx = buildid.AppendToOutgoingContext(ctx, g.buildID)
|
ctx = buildid.AppendToOutgoingContext(ctx, g.buildID)
|
||||||
return g.gateway.Return(ctx, in, opts...)
|
return g.gateway.Return(ctx, in, opts...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (g *gatewayClientForBuild) Inputs(ctx context.Context, in *gatewayapi.InputsRequest, opts ...grpc.CallOption) (*gatewayapi.InputsResponse, error) {
|
||||||
|
ctx = buildid.AppendToOutgoingContext(ctx, g.buildID)
|
||||||
|
return g.gateway.Inputs(ctx, in, opts...)
|
||||||
|
}
|
||||||
|
|
|
@ -11,6 +11,8 @@ import (
|
||||||
"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
|
"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
|
||||||
controlapi "github.com/moby/buildkit/api/services/control"
|
controlapi "github.com/moby/buildkit/api/services/control"
|
||||||
"github.com/moby/buildkit/client/connhelper"
|
"github.com/moby/buildkit/client/connhelper"
|
||||||
|
"github.com/moby/buildkit/session"
|
||||||
|
"github.com/moby/buildkit/session/grpchijack"
|
||||||
"github.com/moby/buildkit/util/appdefaults"
|
"github.com/moby/buildkit/util/appdefaults"
|
||||||
opentracing "github.com/opentracing/opentracing-go"
|
opentracing "github.com/opentracing/opentracing-go"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
@ -80,6 +82,10 @@ func (c *Client) controlClient() controlapi.ControlClient {
|
||||||
return controlapi.NewControlClient(c.conn)
|
return controlapi.NewControlClient(c.conn)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) Dialer() session.Dialer {
|
||||||
|
return grpchijack.Dialer(c.controlClient())
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) Close() error {
|
func (c *Client) Close() error {
|
||||||
return c.conn.Close()
|
return c.conn.Close()
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/Microsoft/go-winio"
|
winio "github.com/Microsoft/go-winio"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,98 @@
|
||||||
|
package llb
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/moby/buildkit/solver/pb"
|
||||||
|
"github.com/moby/buildkit/util/flightcontrol"
|
||||||
|
digest "github.com/opencontainers/go-digest"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
)
|
||||||
|
|
||||||
|
type asyncState struct {
|
||||||
|
f func(context.Context, State) (State, error)
|
||||||
|
prev State
|
||||||
|
target State
|
||||||
|
set bool
|
||||||
|
err error
|
||||||
|
g flightcontrol.Group
|
||||||
|
}
|
||||||
|
|
||||||
|
func (as *asyncState) Output() Output {
|
||||||
|
return as
|
||||||
|
}
|
||||||
|
|
||||||
|
func (as *asyncState) Vertex(ctx context.Context) Vertex {
|
||||||
|
err := as.Do(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return &errVertex{err}
|
||||||
|
}
|
||||||
|
if as.set {
|
||||||
|
out := as.target.Output()
|
||||||
|
if out == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return out.Vertex(ctx)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (as *asyncState) ToInput(ctx context.Context, c *Constraints) (*pb.Input, error) {
|
||||||
|
err := as.Do(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if as.set {
|
||||||
|
out := as.target.Output()
|
||||||
|
if out == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return out.ToInput(ctx, c)
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (as *asyncState) Do(ctx context.Context) error {
|
||||||
|
_, err := as.g.Do(ctx, "", func(ctx context.Context) (interface{}, error) {
|
||||||
|
if as.set {
|
||||||
|
return as.target, as.err
|
||||||
|
}
|
||||||
|
res, err := as.f(ctx, as.prev)
|
||||||
|
if err != nil {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
if errors.Cause(err) == ctx.Err() {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
as.target = res
|
||||||
|
as.err = err
|
||||||
|
as.set = true
|
||||||
|
return res, err
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return as.err
|
||||||
|
}
|
||||||
|
|
||||||
|
type errVertex struct {
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (v *errVertex) Validate(context.Context) error {
|
||||||
|
return v.err
|
||||||
|
}
|
||||||
|
func (v *errVertex) Marshal(context.Context, *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
||||||
|
return "", nil, nil, v.err
|
||||||
|
}
|
||||||
|
func (v *errVertex) Output() Output {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
func (v *errVertex) Inputs() []Output {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ Vertex = &errVertex{}
|
|
@ -0,0 +1,171 @@
|
||||||
|
package llb
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/moby/buildkit/solver/pb"
|
||||||
|
digest "github.com/opencontainers/go-digest"
|
||||||
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DefinitionOp implements llb.Vertex using a marshalled definition.
|
||||||
|
//
|
||||||
|
// For example, after marshalling a LLB state and sending over the wire, the
|
||||||
|
// LLB state can be reconstructed from the definition.
|
||||||
|
type DefinitionOp struct {
|
||||||
|
MarshalCache
|
||||||
|
mu sync.Mutex
|
||||||
|
ops map[digest.Digest]*pb.Op
|
||||||
|
defs map[digest.Digest][]byte
|
||||||
|
metas map[digest.Digest]pb.OpMetadata
|
||||||
|
platforms map[digest.Digest]*specs.Platform
|
||||||
|
dgst digest.Digest
|
||||||
|
index pb.OutputIndex
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDefinitionOp returns a new operation from a marshalled definition.
|
||||||
|
func NewDefinitionOp(def *pb.Definition) (*DefinitionOp, error) {
|
||||||
|
ops := make(map[digest.Digest]*pb.Op)
|
||||||
|
defs := make(map[digest.Digest][]byte)
|
||||||
|
platforms := make(map[digest.Digest]*specs.Platform)
|
||||||
|
|
||||||
|
var dgst digest.Digest
|
||||||
|
for _, dt := range def.Def {
|
||||||
|
var op pb.Op
|
||||||
|
if err := (&op).Unmarshal(dt); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "failed to parse llb proto op")
|
||||||
|
}
|
||||||
|
dgst = digest.FromBytes(dt)
|
||||||
|
ops[dgst] = &op
|
||||||
|
defs[dgst] = dt
|
||||||
|
|
||||||
|
var platform *specs.Platform
|
||||||
|
if op.Platform != nil {
|
||||||
|
spec := op.Platform.Spec()
|
||||||
|
platform = &spec
|
||||||
|
}
|
||||||
|
platforms[dgst] = platform
|
||||||
|
}
|
||||||
|
|
||||||
|
var index pb.OutputIndex
|
||||||
|
if dgst != "" {
|
||||||
|
index = ops[dgst].Inputs[0].Index
|
||||||
|
dgst = ops[dgst].Inputs[0].Digest
|
||||||
|
}
|
||||||
|
|
||||||
|
return &DefinitionOp{
|
||||||
|
ops: ops,
|
||||||
|
defs: defs,
|
||||||
|
metas: def.Metadata,
|
||||||
|
platforms: platforms,
|
||||||
|
dgst: dgst,
|
||||||
|
index: index,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DefinitionOp) ToInput(ctx context.Context, c *Constraints) (*pb.Input, error) {
|
||||||
|
return d.Output().ToInput(ctx, c)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DefinitionOp) Vertex(context.Context) Vertex {
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DefinitionOp) Validate(context.Context) error {
|
||||||
|
// Scratch state has no digest, ops or metas.
|
||||||
|
if d.dgst == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
d.mu.Lock()
|
||||||
|
defer d.mu.Unlock()
|
||||||
|
|
||||||
|
if len(d.ops) == 0 || len(d.defs) == 0 || len(d.metas) == 0 {
|
||||||
|
return errors.Errorf("invalid definition op with no ops %d %d", len(d.ops), len(d.metas))
|
||||||
|
}
|
||||||
|
|
||||||
|
_, ok := d.ops[d.dgst]
|
||||||
|
if !ok {
|
||||||
|
return errors.Errorf("invalid definition op with unknown op %q", d.dgst)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, ok = d.defs[d.dgst]
|
||||||
|
if !ok {
|
||||||
|
return errors.Errorf("invalid definition op with unknown def %q", d.dgst)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, ok = d.metas[d.dgst]
|
||||||
|
if !ok {
|
||||||
|
return errors.Errorf("invalid definition op with unknown metas %q", d.dgst)
|
||||||
|
}
|
||||||
|
|
||||||
|
// It is possible for d.index >= len(d.ops[d.dgst]) when depending on scratch
|
||||||
|
// images.
|
||||||
|
if d.index < 0 {
|
||||||
|
return errors.Errorf("invalid definition op with invalid index")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DefinitionOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
||||||
|
if d.dgst == "" {
|
||||||
|
return "", nil, nil, errors.Errorf("cannot marshal empty definition op")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := d.Validate(ctx); err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
d.mu.Lock()
|
||||||
|
defer d.mu.Unlock()
|
||||||
|
|
||||||
|
meta := d.metas[d.dgst]
|
||||||
|
return d.dgst, d.defs[d.dgst], &meta, nil
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DefinitionOp) Output() Output {
|
||||||
|
if d.dgst == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
d.mu.Lock()
|
||||||
|
platform := d.platforms[d.dgst]
|
||||||
|
d.mu.Unlock()
|
||||||
|
|
||||||
|
return &output{vertex: d, platform: platform, getIndex: func() (pb.OutputIndex, error) {
|
||||||
|
return d.index, nil
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *DefinitionOp) Inputs() []Output {
|
||||||
|
if d.dgst == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var inputs []Output
|
||||||
|
|
||||||
|
d.mu.Lock()
|
||||||
|
op := d.ops[d.dgst]
|
||||||
|
platform := d.platforms[d.dgst]
|
||||||
|
d.mu.Unlock()
|
||||||
|
|
||||||
|
for _, input := range op.Inputs {
|
||||||
|
vtx := &DefinitionOp{
|
||||||
|
ops: d.ops,
|
||||||
|
defs: d.defs,
|
||||||
|
metas: d.metas,
|
||||||
|
platforms: d.platforms,
|
||||||
|
dgst: input.Digest,
|
||||||
|
index: input.Index,
|
||||||
|
}
|
||||||
|
inputs = append(inputs, &output{vertex: vtx, platform: platform, getIndex: func() (pb.OutputIndex, error) {
|
||||||
|
return pb.OutputIndex(vtx.index), nil
|
||||||
|
}})
|
||||||
|
}
|
||||||
|
|
||||||
|
return inputs
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
package llb
|
package llb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
_ "crypto/sha256"
|
_ "crypto/sha256"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
|
@ -12,19 +13,9 @@ import (
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Meta struct {
|
func NewExecOp(base State, proxyEnv *ProxyEnv, readOnly bool, c Constraints) *ExecOp {
|
||||||
Args []string
|
e := &ExecOp{base: base, constraints: c, proxyEnv: proxyEnv}
|
||||||
Env EnvList
|
root := base.Output()
|
||||||
Cwd string
|
|
||||||
User string
|
|
||||||
ProxyEnv *ProxyEnv
|
|
||||||
ExtraHosts []HostIP
|
|
||||||
Network pb.NetMode
|
|
||||||
Security pb.SecurityMode
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewExecOp(root Output, meta Meta, readOnly bool, c Constraints) *ExecOp {
|
|
||||||
e := &ExecOp{meta: meta, constraints: c}
|
|
||||||
rootMount := &mount{
|
rootMount := &mount{
|
||||||
target: pb.RootMount,
|
target: pb.RootMount,
|
||||||
source: root,
|
source: root,
|
||||||
|
@ -58,9 +49,10 @@ type mount struct {
|
||||||
|
|
||||||
type ExecOp struct {
|
type ExecOp struct {
|
||||||
MarshalCache
|
MarshalCache
|
||||||
|
proxyEnv *ProxyEnv
|
||||||
root Output
|
root Output
|
||||||
mounts []*mount
|
mounts []*mount
|
||||||
meta Meta
|
base State
|
||||||
constraints Constraints
|
constraints Constraints
|
||||||
isValidated bool
|
isValidated bool
|
||||||
secrets []SecretInfo
|
secrets []SecretInfo
|
||||||
|
@ -103,19 +95,27 @@ func (e *ExecOp) GetMount(target string) Output {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *ExecOp) Validate() error {
|
func (e *ExecOp) Validate(ctx context.Context) error {
|
||||||
if e.isValidated {
|
if e.isValidated {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if len(e.meta.Args) == 0 {
|
args, err := getArgs(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(args) == 0 {
|
||||||
return errors.Errorf("arguments are required")
|
return errors.Errorf("arguments are required")
|
||||||
}
|
}
|
||||||
if e.meta.Cwd == "" {
|
cwd, err := getDir(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if cwd == "" {
|
||||||
return errors.Errorf("working directory is required")
|
return errors.Errorf("working directory is required")
|
||||||
}
|
}
|
||||||
for _, m := range e.mounts {
|
for _, m := range e.mounts {
|
||||||
if m.source != nil {
|
if m.source != nil {
|
||||||
if err := m.source.Vertex().Validate(); err != nil {
|
if err := m.source.Vertex(ctx).Validate(ctx); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -124,11 +124,11 @@ func (e *ExecOp) Validate() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
func (e *ExecOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
||||||
if e.Cached(c) {
|
if e.Cached(c) {
|
||||||
return e.Load()
|
return e.Load()
|
||||||
}
|
}
|
||||||
if err := e.Validate(); err != nil {
|
if err := e.Validate(ctx); err != nil {
|
||||||
return "", nil, nil, err
|
return "", nil, nil, err
|
||||||
}
|
}
|
||||||
// make sure mounts are sorted
|
// make sure mounts are sorted
|
||||||
|
@ -136,52 +136,86 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
|
||||||
return e.mounts[i].target < e.mounts[j].target
|
return e.mounts[i].target < e.mounts[j].target
|
||||||
})
|
})
|
||||||
|
|
||||||
|
env, err := getEnv(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
if len(e.ssh) > 0 {
|
if len(e.ssh) > 0 {
|
||||||
for i, s := range e.ssh {
|
for i, s := range e.ssh {
|
||||||
if s.Target == "" {
|
if s.Target == "" {
|
||||||
e.ssh[i].Target = fmt.Sprintf("/run/buildkit/ssh_agent.%d", i)
|
e.ssh[i].Target = fmt.Sprintf("/run/buildkit/ssh_agent.%d", i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if _, ok := e.meta.Env.Get("SSH_AUTH_SOCK"); !ok {
|
if _, ok := env.Get("SSH_AUTH_SOCK"); !ok {
|
||||||
e.meta.Env = e.meta.Env.AddOrReplace("SSH_AUTH_SOCK", e.ssh[0].Target)
|
env = env.AddOrReplace("SSH_AUTH_SOCK", e.ssh[0].Target)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if c.Caps != nil {
|
if c.Caps != nil {
|
||||||
if err := c.Caps.Supports(pb.CapExecMetaSetsDefaultPath); err != nil {
|
if err := c.Caps.Supports(pb.CapExecMetaSetsDefaultPath); err != nil {
|
||||||
e.meta.Env = e.meta.Env.SetDefault("PATH", system.DefaultPathEnv)
|
env = env.SetDefault("PATH", system.DefaultPathEnv)
|
||||||
} else {
|
} else {
|
||||||
addCap(&e.constraints, pb.CapExecMetaSetsDefaultPath)
|
addCap(&e.constraints, pb.CapExecMetaSetsDefaultPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
meta := &pb.Meta{
|
args, err := getArgs(e.base)(ctx)
|
||||||
Args: e.meta.Args,
|
if err != nil {
|
||||||
Env: e.meta.Env.ToArray(),
|
return "", nil, nil, err
|
||||||
Cwd: e.meta.Cwd,
|
|
||||||
User: e.meta.User,
|
|
||||||
}
|
}
|
||||||
if len(e.meta.ExtraHosts) > 0 {
|
|
||||||
hosts := make([]*pb.HostIP, len(e.meta.ExtraHosts))
|
cwd, err := getDir(e.base)(ctx)
|
||||||
for i, h := range e.meta.ExtraHosts {
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err := getUser(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
meta := &pb.Meta{
|
||||||
|
Args: args,
|
||||||
|
Env: env.ToArray(),
|
||||||
|
Cwd: cwd,
|
||||||
|
User: user,
|
||||||
|
}
|
||||||
|
extraHosts, err := getExtraHosts(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
if len(extraHosts) > 0 {
|
||||||
|
hosts := make([]*pb.HostIP, len(extraHosts))
|
||||||
|
for i, h := range extraHosts {
|
||||||
hosts[i] = &pb.HostIP{Host: h.Host, IP: h.IP.String()}
|
hosts[i] = &pb.HostIP{Host: h.Host, IP: h.IP.String()}
|
||||||
}
|
}
|
||||||
meta.ExtraHosts = hosts
|
meta.ExtraHosts = hosts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
network, err := getNetwork(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
security, err := getSecurity(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
peo := &pb.ExecOp{
|
peo := &pb.ExecOp{
|
||||||
Meta: meta,
|
Meta: meta,
|
||||||
Network: e.meta.Network,
|
Network: network,
|
||||||
Security: e.meta.Security,
|
Security: security,
|
||||||
}
|
}
|
||||||
if e.meta.Network != NetModeSandbox {
|
if network != NetModeSandbox {
|
||||||
addCap(&e.constraints, pb.CapExecMetaNetwork)
|
addCap(&e.constraints, pb.CapExecMetaNetwork)
|
||||||
}
|
}
|
||||||
|
|
||||||
if e.meta.Security != SecurityModeSandbox {
|
if security != SecurityModeSandbox {
|
||||||
addCap(&e.constraints, pb.CapExecMetaSecurity)
|
addCap(&e.constraints, pb.CapExecMetaSecurity)
|
||||||
}
|
}
|
||||||
|
|
||||||
if p := e.meta.ProxyEnv; p != nil {
|
if p := e.proxyEnv; p != nil {
|
||||||
peo.Meta.ProxyEnv = &pb.ProxyEnv{
|
peo.Meta.ProxyEnv = &pb.ProxyEnv{
|
||||||
HttpProxy: p.HttpProxy,
|
HttpProxy: p.HttpProxy,
|
||||||
HttpsProxy: p.HttpsProxy,
|
HttpsProxy: p.HttpsProxy,
|
||||||
|
@ -215,6 +249,14 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
|
||||||
addCap(&e.constraints, pb.CapExecMountSSH)
|
addCap(&e.constraints, pb.CapExecMountSSH)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if e.constraints.Platform == nil {
|
||||||
|
p, err := getPlatform(e.base)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
e.constraints.Platform = p
|
||||||
|
}
|
||||||
|
|
||||||
pop, md := MarshalConstraints(c, &e.constraints)
|
pop, md := MarshalConstraints(c, &e.constraints)
|
||||||
pop.Op = &pb.Op_Exec{
|
pop.Op = &pb.Op_Exec{
|
||||||
Exec: peo,
|
Exec: peo,
|
||||||
|
@ -227,7 +269,7 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
|
||||||
if m.tmpfs {
|
if m.tmpfs {
|
||||||
return "", nil, nil, errors.Errorf("tmpfs mounts must use scratch")
|
return "", nil, nil, errors.Errorf("tmpfs mounts must use scratch")
|
||||||
}
|
}
|
||||||
inp, err := m.source.ToInput(c)
|
inp, err := m.source.ToInput(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", nil, nil, err
|
return "", nil, nil, err
|
||||||
}
|
}
|
||||||
|
@ -414,17 +456,11 @@ func (fn runOptionFunc) SetRunOption(ei *ExecInfo) {
|
||||||
fn(ei)
|
fn(ei)
|
||||||
}
|
}
|
||||||
|
|
||||||
func Network(n pb.NetMode) RunOption {
|
func (fn StateOption) SetRunOption(ei *ExecInfo) {
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
ei.State = ei.State.With(fn)
|
||||||
ei.State = network(n)(ei.State)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Security(s pb.SecurityMode) RunOption {
|
var _ RunOption = StateOption(func(_ State) State { return State{} })
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = security(s)(ei.State)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func Shlex(str string) RunOption {
|
func Shlex(str string) RunOption {
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
return runOptionFunc(func(ei *ExecInfo) {
|
||||||
|
@ -443,47 +479,12 @@ func Args(a []string) RunOption {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddEnv(key, value string) RunOption {
|
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = ei.State.AddEnv(key, value)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddEnvf(key, value string, v ...interface{}) RunOption {
|
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = ei.State.AddEnvf(key, value, v...)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func User(str string) RunOption {
|
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = ei.State.User(str)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func Dir(str string) RunOption {
|
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = ei.State.Dir(str)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
func Dirf(str string, v ...interface{}) RunOption {
|
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = ei.State.Dirf(str, v...)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddExtraHost(host string, ip net.IP) RunOption {
|
func AddExtraHost(host string, ip net.IP) RunOption {
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
return runOptionFunc(func(ei *ExecInfo) {
|
||||||
ei.State = ei.State.AddExtraHost(host, ip)
|
ei.State = ei.State.AddExtraHost(host, ip)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func Reset(s State) RunOption {
|
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
|
||||||
ei.State = ei.State.Reset(s)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func With(so ...StateOption) RunOption {
|
func With(so ...StateOption) RunOption {
|
||||||
return runOptionFunc(func(ei *ExecInfo) {
|
return runOptionFunc(func(ei *ExecInfo) {
|
||||||
ei.State = ei.State.With(so...)
|
ei.State = ei.State.With(so...)
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package llb
|
package llb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
_ "crypto/sha256"
|
_ "crypto/sha256"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
@ -52,7 +53,7 @@ type CopyInput interface {
|
||||||
}
|
}
|
||||||
|
|
||||||
type subAction interface {
|
type subAction interface {
|
||||||
toProtoAction(string, pb.InputIndex) pb.IsFileAction
|
toProtoAction(context.Context, string, pb.InputIndex) (pb.IsFileAction, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type FileAction struct {
|
type FileAction struct {
|
||||||
|
@ -146,7 +147,7 @@ type fileActionMkdir struct {
|
||||||
info MkdirInfo
|
info MkdirInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *fileActionMkdir) toProtoAction(parent string, base pb.InputIndex) pb.IsFileAction {
|
func (a *fileActionMkdir) toProtoAction(ctx context.Context, parent string, base pb.InputIndex) (pb.IsFileAction, error) {
|
||||||
return &pb.FileAction_Mkdir{
|
return &pb.FileAction_Mkdir{
|
||||||
Mkdir: &pb.FileActionMkDir{
|
Mkdir: &pb.FileActionMkDir{
|
||||||
Path: normalizePath(parent, a.file, false),
|
Path: normalizePath(parent, a.file, false),
|
||||||
|
@ -155,7 +156,7 @@ func (a *fileActionMkdir) toProtoAction(parent string, base pb.InputIndex) pb.Is
|
||||||
Owner: a.info.ChownOpt.marshal(base),
|
Owner: a.info.ChownOpt.marshal(base),
|
||||||
Timestamp: marshalTime(a.info.CreatedTime),
|
Timestamp: marshalTime(a.info.CreatedTime),
|
||||||
},
|
},
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type MkdirOption interface {
|
type MkdirOption interface {
|
||||||
|
@ -315,7 +316,7 @@ type fileActionMkfile struct {
|
||||||
info MkfileInfo
|
info MkfileInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *fileActionMkfile) toProtoAction(parent string, base pb.InputIndex) pb.IsFileAction {
|
func (a *fileActionMkfile) toProtoAction(ctx context.Context, parent string, base pb.InputIndex) (pb.IsFileAction, error) {
|
||||||
return &pb.FileAction_Mkfile{
|
return &pb.FileAction_Mkfile{
|
||||||
Mkfile: &pb.FileActionMkFile{
|
Mkfile: &pb.FileActionMkFile{
|
||||||
Path: normalizePath(parent, a.file, false),
|
Path: normalizePath(parent, a.file, false),
|
||||||
|
@ -324,7 +325,7 @@ func (a *fileActionMkfile) toProtoAction(parent string, base pb.InputIndex) pb.I
|
||||||
Owner: a.info.ChownOpt.marshal(base),
|
Owner: a.info.ChownOpt.marshal(base),
|
||||||
Timestamp: marshalTime(a.info.CreatedTime),
|
Timestamp: marshalTime(a.info.CreatedTime),
|
||||||
},
|
},
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func Rm(p string, opts ...RmOption) *FileAction {
|
func Rm(p string, opts ...RmOption) *FileAction {
|
||||||
|
@ -379,14 +380,14 @@ type fileActionRm struct {
|
||||||
info RmInfo
|
info RmInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *fileActionRm) toProtoAction(parent string, base pb.InputIndex) pb.IsFileAction {
|
func (a *fileActionRm) toProtoAction(ctx context.Context, parent string, base pb.InputIndex) (pb.IsFileAction, error) {
|
||||||
return &pb.FileAction_Rm{
|
return &pb.FileAction_Rm{
|
||||||
Rm: &pb.FileActionRm{
|
Rm: &pb.FileActionRm{
|
||||||
Path: normalizePath(parent, a.file, false),
|
Path: normalizePath(parent, a.file, false),
|
||||||
AllowNotFound: a.info.AllowNotFound,
|
AllowNotFound: a.info.AllowNotFound,
|
||||||
AllowWildcard: a.info.AllowWildcard,
|
AllowWildcard: a.info.AllowWildcard,
|
||||||
},
|
},
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func Copy(input CopyInput, src, dest string, opts ...CopyOption) *FileAction {
|
func Copy(input CopyInput, src, dest string, opts ...CopyOption) *FileAction {
|
||||||
|
@ -448,9 +449,13 @@ type fileActionCopy struct {
|
||||||
info CopyInfo
|
info CopyInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *fileActionCopy) toProtoAction(parent string, base pb.InputIndex) pb.IsFileAction {
|
func (a *fileActionCopy) toProtoAction(ctx context.Context, parent string, base pb.InputIndex) (pb.IsFileAction, error) {
|
||||||
|
src, err := a.sourcePath(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
c := &pb.FileActionCopy{
|
c := &pb.FileActionCopy{
|
||||||
Src: a.sourcePath(),
|
Src: src,
|
||||||
Dest: normalizePath(parent, a.dest, true),
|
Dest: normalizePath(parent, a.dest, true),
|
||||||
Owner: a.info.ChownOpt.marshal(base),
|
Owner: a.info.ChownOpt.marshal(base),
|
||||||
AllowWildcard: a.info.AllowWildcard,
|
AllowWildcard: a.info.AllowWildcard,
|
||||||
|
@ -468,19 +473,27 @@ func (a *fileActionCopy) toProtoAction(parent string, base pb.InputIndex) pb.IsF
|
||||||
}
|
}
|
||||||
return &pb.FileAction_Copy{
|
return &pb.FileAction_Copy{
|
||||||
Copy: c,
|
Copy: c,
|
||||||
}
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *fileActionCopy) sourcePath() string {
|
func (c *fileActionCopy) sourcePath(ctx context.Context) (string, error) {
|
||||||
p := path.Clean(c.src)
|
p := path.Clean(c.src)
|
||||||
if !path.IsAbs(p) {
|
if !path.IsAbs(p) {
|
||||||
if c.state != nil {
|
if c.state != nil {
|
||||||
p = path.Join("/", c.state.GetDir(), p)
|
dir, err := c.state.GetDir(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
p = path.Join("/", dir, p)
|
||||||
} else if c.fas != nil {
|
} else if c.fas != nil {
|
||||||
p = path.Join("/", c.fas.state.GetDir(), p)
|
dir, err := c.fas.state.GetDir(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
p = path.Join("/", dir, p)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return p
|
return p, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type CreatedTime time.Time
|
type CreatedTime time.Time
|
||||||
|
@ -517,7 +530,7 @@ type FileOp struct {
|
||||||
isValidated bool
|
isValidated bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *FileOp) Validate() error {
|
func (f *FileOp) Validate(context.Context) error {
|
||||||
if f.isValidated {
|
if f.isValidated {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -529,14 +542,16 @@ func (f *FileOp) Validate() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
type marshalState struct {
|
type marshalState struct {
|
||||||
|
ctx context.Context
|
||||||
visited map[*FileAction]*fileActionState
|
visited map[*FileAction]*fileActionState
|
||||||
inputs []*pb.Input
|
inputs []*pb.Input
|
||||||
actions []*fileActionState
|
actions []*fileActionState
|
||||||
}
|
}
|
||||||
|
|
||||||
func newMarshalState() *marshalState {
|
func newMarshalState(ctx context.Context) *marshalState {
|
||||||
return &marshalState{
|
return &marshalState{
|
||||||
visited: map[*FileAction]*fileActionState{},
|
visited: map[*FileAction]*fileActionState{},
|
||||||
|
ctx: ctx,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -552,7 +567,7 @@ type fileActionState struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ms *marshalState) addInput(st *fileActionState, c *Constraints, o Output) (pb.InputIndex, error) {
|
func (ms *marshalState) addInput(st *fileActionState, c *Constraints, o Output) (pb.InputIndex, error) {
|
||||||
inp, err := o.ToInput(c)
|
inp, err := o.ToInput(ms.ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
@ -634,11 +649,11 @@ func (ms *marshalState) add(fa *FileAction, c *Constraints) (*fileActionState, e
|
||||||
return st, nil
|
return st, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *FileOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
func (f *FileOp) Marshal(ctx context.Context, c *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
||||||
if f.Cached(c) {
|
if f.Cached(c) {
|
||||||
return f.Load()
|
return f.Load()
|
||||||
}
|
}
|
||||||
if err := f.Validate(); err != nil {
|
if err := f.Validate(ctx); err != nil {
|
||||||
return "", nil, nil, err
|
return "", nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -651,7 +666,7 @@ func (f *FileOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
|
||||||
File: pfo,
|
File: pfo,
|
||||||
}
|
}
|
||||||
|
|
||||||
state := newMarshalState()
|
state := newMarshalState(ctx)
|
||||||
_, err := state.add(f.action, c)
|
_, err := state.add(f.action, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", nil, nil, err
|
return "", nil, nil, err
|
||||||
|
@ -666,14 +681,22 @@ func (f *FileOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
|
||||||
|
|
||||||
var parent string
|
var parent string
|
||||||
if st.fa.state != nil {
|
if st.fa.state != nil {
|
||||||
parent = st.fa.state.GetDir()
|
parent, err = st.fa.state.GetDir(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
action, err := st.action.toProtoAction(ctx, parent, st.base)
|
||||||
|
if err != nil {
|
||||||
|
return "", nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
pfo.Actions = append(pfo.Actions, &pb.FileAction{
|
pfo.Actions = append(pfo.Actions, &pb.FileAction{
|
||||||
Input: getIndex(st.input, len(state.inputs), st.inputRelative),
|
Input: getIndex(st.input, len(state.inputs), st.inputRelative),
|
||||||
SecondaryInput: getIndex(st.input2, len(state.inputs), st.input2Relative),
|
SecondaryInput: getIndex(st.input2, len(state.inputs), st.input2Relative),
|
||||||
Output: output,
|
Output: output,
|
||||||
Action: st.action.toProtoAction(parent, st.base),
|
Action: action,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package llb
|
package llb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"path"
|
"path"
|
||||||
|
@ -24,79 +25,122 @@ var (
|
||||||
keySecurity = contextKeyT("llb.security")
|
keySecurity = contextKeyT("llb.security")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func AddEnvf(key, value string, v ...interface{}) StateOption {
|
||||||
|
return addEnvf(key, value, true, v...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func AddEnv(key, value string) StateOption {
|
||||||
|
return addEnvf(key, value, false)
|
||||||
|
}
|
||||||
|
|
||||||
func addEnvf(key, value string, replace bool, v ...interface{}) StateOption {
|
func addEnvf(key, value string, replace bool, v ...interface{}) StateOption {
|
||||||
if replace {
|
if replace {
|
||||||
value = fmt.Sprintf(value, v...)
|
value = fmt.Sprintf(value, v...)
|
||||||
}
|
}
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
return s.WithValue(keyEnv, getEnv(s).AddOrReplace(key, value))
|
return s.withValue(keyEnv, func(ctx context.Context) (interface{}, error) {
|
||||||
|
env, err := getEnv(s)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return env.AddOrReplace(key, value), nil
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func dir(str string) StateOption {
|
func Dir(str string) StateOption {
|
||||||
return dirf(str, false)
|
return dirf(str, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Dirf(str string, v ...interface{}) StateOption {
|
||||||
|
return dirf(str, true, v...)
|
||||||
|
}
|
||||||
|
|
||||||
func dirf(value string, replace bool, v ...interface{}) StateOption {
|
func dirf(value string, replace bool, v ...interface{}) StateOption {
|
||||||
if replace {
|
if replace {
|
||||||
value = fmt.Sprintf(value, v...)
|
value = fmt.Sprintf(value, v...)
|
||||||
}
|
}
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
|
return s.withValue(keyDir, func(ctx context.Context) (interface{}, error) {
|
||||||
if !path.IsAbs(value) {
|
if !path.IsAbs(value) {
|
||||||
prev := getDir(s)
|
prev, err := getDir(s)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
if prev == "" {
|
if prev == "" {
|
||||||
prev = "/"
|
prev = "/"
|
||||||
}
|
}
|
||||||
value = path.Join(prev, value)
|
value = path.Join(prev, value)
|
||||||
}
|
}
|
||||||
return s.WithValue(keyDir, value)
|
return value, nil
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func user(str string) StateOption {
|
func User(str string) StateOption {
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
return s.WithValue(keyUser, str)
|
return s.WithValue(keyUser, str)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func reset(s_ State) StateOption {
|
func Reset(other State) StateOption {
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
s = NewState(s.Output())
|
s = NewState(s.Output())
|
||||||
s.ctx = s_.ctx
|
s.prev = &other
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getEnv(s State) EnvList {
|
func getEnv(s State) func(context.Context) (EnvList, error) {
|
||||||
v := s.Value(keyEnv)
|
return func(ctx context.Context) (EnvList, error) {
|
||||||
if v != nil {
|
v, err := s.getValue(keyEnv)(ctx)
|
||||||
return v.(EnvList)
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if v != nil {
|
||||||
|
return v.(EnvList), nil
|
||||||
|
}
|
||||||
|
return EnvList{}, nil
|
||||||
}
|
}
|
||||||
return EnvList{}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDir(s State) string {
|
func getDir(s State) func(context.Context) (string, error) {
|
||||||
v := s.Value(keyDir)
|
return func(ctx context.Context) (string, error) {
|
||||||
if v != nil {
|
v, err := s.getValue(keyDir)(ctx)
|
||||||
return v.(string)
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if v != nil {
|
||||||
|
return v.(string), nil
|
||||||
|
}
|
||||||
|
return "", nil
|
||||||
}
|
}
|
||||||
return ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getArgs(s State) []string {
|
func getArgs(s State) func(context.Context) ([]string, error) {
|
||||||
v := s.Value(keyArgs)
|
return func(ctx context.Context) ([]string, error) {
|
||||||
if v != nil {
|
v, err := s.getValue(keyArgs)(ctx)
|
||||||
return v.([]string)
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if v != nil {
|
||||||
|
return v.([]string), nil
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getUser(s State) string {
|
func getUser(s State) func(context.Context) (string, error) {
|
||||||
v := s.Value(keyUser)
|
return func(ctx context.Context) (string, error) {
|
||||||
if v != nil {
|
v, err := s.getValue(keyUser)(ctx)
|
||||||
return v.(string)
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if v != nil {
|
||||||
|
return v.(string), nil
|
||||||
|
}
|
||||||
|
return "", nil
|
||||||
}
|
}
|
||||||
return ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func args(args ...string) StateOption {
|
func args(args ...string) StateOption {
|
||||||
|
@ -124,27 +168,43 @@ func platform(p specs.Platform) StateOption {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getPlatform(s State) *specs.Platform {
|
func getPlatform(s State) func(context.Context) (*specs.Platform, error) {
|
||||||
v := s.Value(keyPlatform)
|
return func(ctx context.Context) (*specs.Platform, error) {
|
||||||
|
v, err := s.getValue(keyPlatform)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
if v != nil {
|
if v != nil {
|
||||||
p := v.(specs.Platform)
|
p := v.(specs.Platform)
|
||||||
return &p
|
return &p, nil
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func extraHost(host string, ip net.IP) StateOption {
|
func extraHost(host string, ip net.IP) StateOption {
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
return s.WithValue(keyExtraHost, append(getExtraHosts(s), HostIP{Host: host, IP: ip}))
|
return s.withValue(keyExtraHost, func(ctx context.Context) (interface{}, error) {
|
||||||
|
v, err := getExtraHosts(s)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return append(v, HostIP{Host: host, IP: ip}), nil
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getExtraHosts(s State) []HostIP {
|
func getExtraHosts(s State) func(context.Context) ([]HostIP, error) {
|
||||||
v := s.Value(keyExtraHost)
|
return func(ctx context.Context) ([]HostIP, error) {
|
||||||
if v != nil {
|
v, err := s.getValue(keyExtraHost)(ctx)
|
||||||
return v.([]HostIP)
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if v != nil {
|
||||||
|
return v.([]HostIP), nil
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type HostIP struct {
|
type HostIP struct {
|
||||||
|
@ -152,32 +212,42 @@ type HostIP struct {
|
||||||
IP net.IP
|
IP net.IP
|
||||||
}
|
}
|
||||||
|
|
||||||
func network(v pb.NetMode) StateOption {
|
func Network(v pb.NetMode) StateOption {
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
return s.WithValue(keyNetwork, v)
|
return s.WithValue(keyNetwork, v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func getNetwork(s State) pb.NetMode {
|
func getNetwork(s State) func(context.Context) (pb.NetMode, error) {
|
||||||
v := s.Value(keyNetwork)
|
return func(ctx context.Context) (pb.NetMode, error) {
|
||||||
|
v, err := s.getValue(keyNetwork)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
if v != nil {
|
if v != nil {
|
||||||
n := v.(pb.NetMode)
|
n := v.(pb.NetMode)
|
||||||
return n
|
return n, nil
|
||||||
|
}
|
||||||
|
return NetModeSandbox, nil
|
||||||
}
|
}
|
||||||
return NetModeSandbox
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func security(v pb.SecurityMode) StateOption {
|
func Security(v pb.SecurityMode) StateOption {
|
||||||
return func(s State) State {
|
return func(s State) State {
|
||||||
return s.WithValue(keySecurity, v)
|
return s.WithValue(keySecurity, v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func getSecurity(s State) pb.SecurityMode {
|
func getSecurity(s State) func(context.Context) (pb.SecurityMode, error) {
|
||||||
v := s.Value(keySecurity)
|
return func(ctx context.Context) (pb.SecurityMode, error) {
|
||||||
|
v, err := s.getValue(keySecurity)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
if v != nil {
|
if v != nil {
|
||||||
n := v.(pb.SecurityMode)
|
n := v.(pb.SecurityMode)
|
||||||
return n
|
return n, nil
|
||||||
|
}
|
||||||
|
return SecurityModeSandbox, nil
|
||||||
}
|
}
|
||||||
return SecurityModeSandbox
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type EnvList []KeyValue
|
type EnvList []KeyValue
|
||||||
|
|
|
@ -3,8 +3,8 @@ package llb
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
gw "github.com/moby/buildkit/frontend/gateway/client"
|
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
|
specs "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// WithMetaResolver adds a metadata resolver to an image
|
// WithMetaResolver adds a metadata resolver to an image
|
||||||
|
@ -14,7 +14,22 @@ func WithMetaResolver(mr ImageMetaResolver) ImageOption {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ResolveDigest uses the meta resolver to update the ref of image with full digest before marshaling.
|
||||||
|
// This makes image ref immutable and is recommended if you want to make sure meta resolver data
|
||||||
|
// matches the image used during the build.
|
||||||
|
func ResolveDigest(v bool) ImageOption {
|
||||||
|
return imageOptionFunc(func(ii *ImageInfo) {
|
||||||
|
ii.resolveDigest = v
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// ImageMetaResolver can resolve image config metadata from a reference
|
// ImageMetaResolver can resolve image config metadata from a reference
|
||||||
type ImageMetaResolver interface {
|
type ImageMetaResolver interface {
|
||||||
ResolveImageConfig(ctx context.Context, ref string, opt gw.ResolveImageConfigOpt) (digest.Digest, []byte, error)
|
ResolveImageConfig(ctx context.Context, ref string, opt ResolveImageConfigOpt) (digest.Digest, []byte, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type ResolveImageConfigOpt struct {
|
||||||
|
Platform *specs.Platform
|
||||||
|
ResolveMode string
|
||||||
|
LogName string
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
gw "github.com/moby/buildkit/frontend/gateway/client"
|
|
||||||
"github.com/moby/buildkit/solver/pb"
|
"github.com/moby/buildkit/solver/pb"
|
||||||
"github.com/moby/buildkit/util/apicaps"
|
"github.com/moby/buildkit/util/apicaps"
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
|
@ -35,7 +34,7 @@ func NewSource(id string, attrs map[string]string, c Constraints) *SourceOp {
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SourceOp) Validate() error {
|
func (s *SourceOp) Validate(ctx context.Context) error {
|
||||||
if s.err != nil {
|
if s.err != nil {
|
||||||
return s.err
|
return s.err
|
||||||
}
|
}
|
||||||
|
@ -45,11 +44,11 @@ func (s *SourceOp) Validate() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SourceOp) Marshal(constraints *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
func (s *SourceOp) Marshal(ctx context.Context, constraints *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error) {
|
||||||
if s.Cached(constraints) {
|
if s.Cached(constraints) {
|
||||||
return s.Load()
|
return s.Load()
|
||||||
}
|
}
|
||||||
if err := s.Validate(); err != nil {
|
if err := s.Validate(ctx); err != nil {
|
||||||
return "", nil, nil, err
|
return "", nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +92,8 @@ func (s *SourceOp) Inputs() []Output {
|
||||||
func Image(ref string, opts ...ImageOption) State {
|
func Image(ref string, opts ...ImageOption) State {
|
||||||
r, err := reference.ParseNormalizedNamed(ref)
|
r, err := reference.ParseNormalizedNamed(ref)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
ref = reference.TagNameOnly(r).String()
|
r = reference.TagNameOnly(r)
|
||||||
|
ref = r.String()
|
||||||
}
|
}
|
||||||
var info ImageInfo
|
var info ImageInfo
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
|
@ -117,21 +117,35 @@ func Image(ref string, opts ...ImageOption) State {
|
||||||
src := NewSource("docker-image://"+ref, attrs, info.Constraints) // controversial
|
src := NewSource("docker-image://"+ref, attrs, info.Constraints) // controversial
|
||||||
if err != nil {
|
if err != nil {
|
||||||
src.err = err
|
src.err = err
|
||||||
}
|
} else if info.metaResolver != nil {
|
||||||
if info.metaResolver != nil {
|
if _, ok := r.(reference.Digested); ok || !info.resolveDigest {
|
||||||
_, dt, err := info.metaResolver.ResolveImageConfig(context.TODO(), ref, gw.ResolveImageConfigOpt{
|
return NewState(src.Output()).Async(func(ctx context.Context, st State) (State, error) {
|
||||||
|
_, dt, err := info.metaResolver.ResolveImageConfig(ctx, ref, ResolveImageConfigOpt{
|
||||||
Platform: info.Constraints.Platform,
|
Platform: info.Constraints.Platform,
|
||||||
ResolveMode: info.resolveMode.String(),
|
ResolveMode: info.resolveMode.String(),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
src.err = err
|
return State{}, err
|
||||||
} else {
|
|
||||||
st, err := NewState(src.Output()).WithImageConfig(dt)
|
|
||||||
if err == nil {
|
|
||||||
return st
|
|
||||||
}
|
}
|
||||||
src.err = err
|
return st.WithImageConfig(dt)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
return Scratch().Async(func(ctx context.Context, _ State) (State, error) {
|
||||||
|
dgst, dt, err := info.metaResolver.ResolveImageConfig(context.TODO(), ref, ResolveImageConfigOpt{
|
||||||
|
Platform: info.Constraints.Platform,
|
||||||
|
ResolveMode: info.resolveMode.String(),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return State{}, err
|
||||||
|
}
|
||||||
|
if dgst != "" {
|
||||||
|
r, err = reference.WithDigest(r, dgst)
|
||||||
|
if err != nil {
|
||||||
|
return State{}, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return NewState(NewSource("docker-image://"+r.String(), attrs, info.Constraints).Output()).WithImageConfig(dt)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
return NewState(src.Output())
|
return NewState(src.Output())
|
||||||
}
|
}
|
||||||
|
@ -178,6 +192,7 @@ func (r ResolveMode) String() string {
|
||||||
type ImageInfo struct {
|
type ImageInfo struct {
|
||||||
constraintsWrapper
|
constraintsWrapper
|
||||||
metaResolver ImageMetaResolver
|
metaResolver ImageMetaResolver
|
||||||
|
resolveDigest bool
|
||||||
resolveMode ResolveMode
|
resolveMode ResolveMode
|
||||||
RecordType string
|
RecordType string
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,13 +18,13 @@ import (
|
||||||
type StateOption func(State) State
|
type StateOption func(State) State
|
||||||
|
|
||||||
type Output interface {
|
type Output interface {
|
||||||
ToInput(*Constraints) (*pb.Input, error)
|
ToInput(context.Context, *Constraints) (*pb.Input, error)
|
||||||
Vertex() Vertex
|
Vertex(context.Context) Vertex
|
||||||
}
|
}
|
||||||
|
|
||||||
type Vertex interface {
|
type Vertex interface {
|
||||||
Validate() error
|
Validate(context.Context) error
|
||||||
Marshal(*Constraints) (digest.Digest, []byte, *pb.OpMetadata, error)
|
Marshal(context.Context, *Constraints) (digest.Digest, []byte, *pb.OpMetadata, error)
|
||||||
Output() Output
|
Output() Output
|
||||||
Inputs() []Output
|
Inputs() []Output
|
||||||
}
|
}
|
||||||
|
@ -32,17 +32,18 @@ type Vertex interface {
|
||||||
func NewState(o Output) State {
|
func NewState(o Output) State {
|
||||||
s := State{
|
s := State{
|
||||||
out: o,
|
out: o,
|
||||||
ctx: context.Background(),
|
}.Dir("/")
|
||||||
}
|
|
||||||
s = dir("/")(s)
|
|
||||||
s = s.ensurePlatform()
|
s = s.ensurePlatform()
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
type State struct {
|
type State struct {
|
||||||
out Output
|
out Output
|
||||||
ctx context.Context
|
prev *State
|
||||||
|
key interface{}
|
||||||
|
value func(context.Context) (interface{}, error)
|
||||||
opts []ConstraintsOpt
|
opts []ConstraintsOpt
|
||||||
|
async *asyncState
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) ensurePlatform() State {
|
func (s State) ensurePlatform() State {
|
||||||
|
@ -57,14 +58,48 @@ func (s State) ensurePlatform() State {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) WithValue(k, v interface{}) State {
|
func (s State) WithValue(k, v interface{}) State {
|
||||||
|
return s.withValue(k, func(context.Context) (interface{}, error) {
|
||||||
|
return v, nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s State) withValue(k interface{}, v func(context.Context) (interface{}, error)) State {
|
||||||
return State{
|
return State{
|
||||||
out: s.out,
|
out: s.Output(),
|
||||||
ctx: context.WithValue(s.ctx, k, v),
|
prev: &s, // doesn't need to be original pointer
|
||||||
|
key: k,
|
||||||
|
value: v,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Value(k interface{}) interface{} {
|
func (s State) Value(ctx context.Context, k interface{}) (interface{}, error) {
|
||||||
return s.ctx.Value(k)
|
return s.getValue(k)(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s State) getValue(k interface{}) func(context.Context) (interface{}, error) {
|
||||||
|
if s.key == k {
|
||||||
|
return s.value
|
||||||
|
}
|
||||||
|
if s.async != nil {
|
||||||
|
return func(ctx context.Context) (interface{}, error) {
|
||||||
|
err := s.async.Do(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return s.async.target.getValue(k)(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if s.prev == nil {
|
||||||
|
return nilValue
|
||||||
|
}
|
||||||
|
return s.prev.getValue(k)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s State) Async(f func(context.Context, State) (State, error)) State {
|
||||||
|
s2 := State{
|
||||||
|
async: &asyncState{f: f, prev: s},
|
||||||
|
}
|
||||||
|
return s2
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) SetMarshalDefaults(co ...ConstraintsOpt) State {
|
func (s State) SetMarshalDefaults(co ...ConstraintsOpt) State {
|
||||||
|
@ -72,11 +107,11 @@ func (s State) SetMarshalDefaults(co ...ConstraintsOpt) State {
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Marshal(co ...ConstraintsOpt) (*Definition, error) {
|
func (s State) Marshal(ctx context.Context, co ...ConstraintsOpt) (*Definition, error) {
|
||||||
def := &Definition{
|
def := &Definition{
|
||||||
Metadata: make(map[digest.Digest]pb.OpMetadata, 0),
|
Metadata: make(map[digest.Digest]pb.OpMetadata, 0),
|
||||||
}
|
}
|
||||||
if s.Output() == nil {
|
if s.Output() == nil || s.Output().Vertex(ctx) == nil {
|
||||||
return def, nil
|
return def, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,11 +124,11 @@ func (s State) Marshal(co ...ConstraintsOpt) (*Definition, error) {
|
||||||
o.SetConstraintsOption(c)
|
o.SetConstraintsOption(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
def, err := marshal(s.Output().Vertex(), def, map[digest.Digest]struct{}{}, map[Vertex]struct{}{}, c)
|
def, err := marshal(ctx, s.Output().Vertex(ctx), def, map[digest.Digest]struct{}{}, map[Vertex]struct{}{}, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return def, err
|
return def, err
|
||||||
}
|
}
|
||||||
inp, err := s.Output().ToInput(c)
|
inp, err := s.Output().ToInput(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return def, err
|
return def, err
|
||||||
}
|
}
|
||||||
|
@ -128,19 +163,19 @@ func (s State) Marshal(co ...ConstraintsOpt) (*Definition, error) {
|
||||||
return def, nil
|
return def, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func marshal(v Vertex, def *Definition, cache map[digest.Digest]struct{}, vertexCache map[Vertex]struct{}, c *Constraints) (*Definition, error) {
|
func marshal(ctx context.Context, v Vertex, def *Definition, cache map[digest.Digest]struct{}, vertexCache map[Vertex]struct{}, c *Constraints) (*Definition, error) {
|
||||||
if _, ok := vertexCache[v]; ok {
|
if _, ok := vertexCache[v]; ok {
|
||||||
return def, nil
|
return def, nil
|
||||||
}
|
}
|
||||||
for _, inp := range v.Inputs() {
|
for _, inp := range v.Inputs() {
|
||||||
var err error
|
var err error
|
||||||
def, err = marshal(inp.Vertex(), def, cache, vertexCache, c)
|
def, err = marshal(ctx, inp.Vertex(ctx), def, cache, vertexCache, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return def, err
|
return def, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dgst, dt, opMeta, err := v.Marshal(c)
|
dgst, dt, opMeta, err := v.Marshal(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return def, err
|
return def, err
|
||||||
}
|
}
|
||||||
|
@ -156,18 +191,22 @@ func marshal(v Vertex, def *Definition, cache map[digest.Digest]struct{}, vertex
|
||||||
return def, nil
|
return def, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Validate() error {
|
func (s State) Validate(ctx context.Context) error {
|
||||||
return s.Output().Vertex().Validate()
|
return s.Output().Vertex(ctx).Validate(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Output() Output {
|
func (s State) Output() Output {
|
||||||
|
if s.async != nil {
|
||||||
|
return s.async.Output()
|
||||||
|
}
|
||||||
return s.out
|
return s.out
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) WithOutput(o Output) State {
|
func (s State) WithOutput(o Output) State {
|
||||||
|
prev := s
|
||||||
s = State{
|
s = State{
|
||||||
out: o,
|
out: o,
|
||||||
ctx: s.ctx,
|
prev: &prev,
|
||||||
}
|
}
|
||||||
s = s.ensurePlatform()
|
s = s.ensurePlatform()
|
||||||
return s
|
return s
|
||||||
|
@ -200,24 +239,10 @@ func (s State) WithImageConfig(c []byte) (State, error) {
|
||||||
|
|
||||||
func (s State) Run(ro ...RunOption) ExecState {
|
func (s State) Run(ro ...RunOption) ExecState {
|
||||||
ei := &ExecInfo{State: s}
|
ei := &ExecInfo{State: s}
|
||||||
if p := s.GetPlatform(); p != nil {
|
|
||||||
ei.Constraints.Platform = p
|
|
||||||
}
|
|
||||||
for _, o := range ro {
|
for _, o := range ro {
|
||||||
o.SetRunOption(ei)
|
o.SetRunOption(ei)
|
||||||
}
|
}
|
||||||
meta := Meta{
|
exec := NewExecOp(ei.State, ei.ProxyEnv, ei.ReadonlyRootFS, ei.Constraints)
|
||||||
Args: getArgs(ei.State),
|
|
||||||
Cwd: getDir(ei.State),
|
|
||||||
Env: getEnv(ei.State),
|
|
||||||
User: getUser(ei.State),
|
|
||||||
ProxyEnv: ei.ProxyEnv,
|
|
||||||
ExtraHosts: getExtraHosts(ei.State),
|
|
||||||
Network: getNetwork(ei.State),
|
|
||||||
Security: getSecurity(ei.State),
|
|
||||||
}
|
|
||||||
|
|
||||||
exec := NewExecOp(s.Output(), meta, ei.ReadonlyRootFS, ei.Constraints)
|
|
||||||
for _, m := range ei.Mounts {
|
for _, m := range ei.Mounts {
|
||||||
exec.AddMount(m.Target, m.Source, m.Opts...)
|
exec.AddMount(m.Target, m.Source, m.Opts...)
|
||||||
}
|
}
|
||||||
|
@ -240,65 +265,74 @@ func (s State) File(a *FileAction, opts ...ConstraintsOpt) State {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) AddEnv(key, value string) State {
|
func (s State) AddEnv(key, value string) State {
|
||||||
return addEnvf(key, value, false)(s)
|
return AddEnv(key, value)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) AddEnvf(key, value string, v ...interface{}) State {
|
func (s State) AddEnvf(key, value string, v ...interface{}) State {
|
||||||
return addEnvf(key, value, true, v...)(s)
|
return AddEnvf(key, value, v...)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Dir(str string) State {
|
func (s State) Dir(str string) State {
|
||||||
return dirf(str, false)(s)
|
return Dir(str)(s)
|
||||||
}
|
}
|
||||||
func (s State) Dirf(str string, v ...interface{}) State {
|
func (s State) Dirf(str string, v ...interface{}) State {
|
||||||
return dirf(str, true, v...)(s)
|
return Dirf(str, v...)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) GetEnv(key string) (string, bool) {
|
func (s State) GetEnv(ctx context.Context, key string) (string, bool, error) {
|
||||||
return getEnv(s).Get(key)
|
env, err := getEnv(s)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", false, err
|
||||||
|
}
|
||||||
|
v, ok := env.Get(key)
|
||||||
|
return v, ok, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Env() []string {
|
func (s State) Env(ctx context.Context) ([]string, error) {
|
||||||
return getEnv(s).ToArray()
|
env, err := getEnv(s)(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return env.ToArray(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) GetDir() string {
|
func (s State) GetDir(ctx context.Context) (string, error) {
|
||||||
return getDir(s)
|
return getDir(s)(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) GetArgs() []string {
|
func (s State) GetArgs(ctx context.Context) ([]string, error) {
|
||||||
return getArgs(s)
|
return getArgs(s)(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Reset(s2 State) State {
|
func (s State) Reset(s2 State) State {
|
||||||
return reset(s2)(s)
|
return Reset(s2)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) User(v string) State {
|
func (s State) User(v string) State {
|
||||||
return user(v)(s)
|
return User(v)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Platform(p specs.Platform) State {
|
func (s State) Platform(p specs.Platform) State {
|
||||||
return platform(p)(s)
|
return platform(p)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) GetPlatform() *specs.Platform {
|
func (s State) GetPlatform(ctx context.Context) (*specs.Platform, error) {
|
||||||
return getPlatform(s)
|
return getPlatform(s)(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) Network(n pb.NetMode) State {
|
func (s State) Network(n pb.NetMode) State {
|
||||||
return network(n)(s)
|
return Network(n)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) GetNetwork() pb.NetMode {
|
func (s State) GetNetwork(ctx context.Context) (pb.NetMode, error) {
|
||||||
return getNetwork(s)
|
return getNetwork(s)(ctx)
|
||||||
}
|
}
|
||||||
func (s State) Security(n pb.SecurityMode) State {
|
func (s State) Security(n pb.SecurityMode) State {
|
||||||
return security(n)(s)
|
return Security(n)(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) GetSecurity() pb.SecurityMode {
|
func (s State) GetSecurity(ctx context.Context) (pb.SecurityMode, error) {
|
||||||
return getSecurity(s)
|
return getSecurity(s)(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s State) With(so ...StateOption) State {
|
func (s State) With(so ...StateOption) State {
|
||||||
|
@ -321,7 +355,7 @@ type output struct {
|
||||||
platform *specs.Platform
|
platform *specs.Platform
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *output) ToInput(c *Constraints) (*pb.Input, error) {
|
func (o *output) ToInput(ctx context.Context, c *Constraints) (*pb.Input, error) {
|
||||||
if o.err != nil {
|
if o.err != nil {
|
||||||
return nil, o.err
|
return nil, o.err
|
||||||
}
|
}
|
||||||
|
@ -333,14 +367,14 @@ func (o *output) ToInput(c *Constraints) (*pb.Input, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dgst, _, _, err := o.vertex.Marshal(c)
|
dgst, _, _, err := o.vertex.Marshal(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &pb.Input{Digest: dgst, Index: index}, nil
|
return &pb.Input{Digest: dgst, Index: index}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *output) Vertex() Vertex {
|
func (o *output) Vertex(context.Context) Vertex {
|
||||||
return o.vertex
|
return o.vertex
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -513,3 +547,7 @@ func Require(filters ...string) ConstraintsOpt {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func nilValue(context.Context) (interface{}, error) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
|
@ -35,6 +35,7 @@ type SolveOpt struct {
|
||||||
SharedKey string
|
SharedKey string
|
||||||
Frontend string
|
Frontend string
|
||||||
FrontendAttrs map[string]string
|
FrontendAttrs map[string]string
|
||||||
|
FrontendInputs map[string]llb.State
|
||||||
CacheExports []CacheOptionsEntry
|
CacheExports []CacheOptionsEntry
|
||||||
CacheImports []CacheOptionsEntry
|
CacheImports []CacheOptionsEntry
|
||||||
Session []session.Attachable
|
Session []session.Attachable
|
||||||
|
@ -114,6 +115,12 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
|
||||||
}
|
}
|
||||||
|
|
||||||
var ex ExportEntry
|
var ex ExportEntry
|
||||||
|
if len(opt.Exports) > 1 {
|
||||||
|
return nil, errors.New("currently only single Exports can be specified")
|
||||||
|
}
|
||||||
|
if len(opt.Exports) == 1 {
|
||||||
|
ex = opt.Exports[0]
|
||||||
|
}
|
||||||
|
|
||||||
if !opt.SessionPreInitialized {
|
if !opt.SessionPreInitialized {
|
||||||
if len(syncedDirs) > 0 {
|
if len(syncedDirs) > 0 {
|
||||||
|
@ -124,13 +131,6 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
|
||||||
s.Allow(a)
|
s.Allow(a)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(opt.Exports) > 1 {
|
|
||||||
return nil, errors.New("currently only single Exports can be specified")
|
|
||||||
}
|
|
||||||
if len(opt.Exports) == 1 {
|
|
||||||
ex = opt.Exports[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
switch ex.Type {
|
switch ex.Type {
|
||||||
case ExporterLocal:
|
case ExporterLocal:
|
||||||
if ex.Output != nil {
|
if ex.Output != nil {
|
||||||
|
@ -188,6 +188,16 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
|
||||||
if def != nil {
|
if def != nil {
|
||||||
pbd = def.ToPB()
|
pbd = def.ToPB()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
frontendInputs := make(map[string]*pb.Definition)
|
||||||
|
for key, st := range opt.FrontendInputs {
|
||||||
|
def, err := st.Marshal(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
frontendInputs[key] = def.ToPB()
|
||||||
|
}
|
||||||
|
|
||||||
resp, err := c.controlClient().Solve(ctx, &controlapi.SolveRequest{
|
resp, err := c.controlClient().Solve(ctx, &controlapi.SolveRequest{
|
||||||
Ref: ref,
|
Ref: ref,
|
||||||
Definition: pbd,
|
Definition: pbd,
|
||||||
|
@ -196,6 +206,7 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
|
||||||
Session: s.ID(),
|
Session: s.ID(),
|
||||||
Frontend: opt.Frontend,
|
Frontend: opt.Frontend,
|
||||||
FrontendAttrs: opt.FrontendAttrs,
|
FrontendAttrs: opt.FrontendAttrs,
|
||||||
|
FrontendInputs: frontendInputs,
|
||||||
Cache: cacheOpt.options,
|
Cache: cacheOpt.options,
|
||||||
Entitlements: opt.AllowedEntitlements,
|
Entitlements: opt.AllowedEntitlements,
|
||||||
})
|
})
|
||||||
|
@ -412,26 +423,28 @@ func parseCacheOptions(opt SolveOpt) (*cacheOptions, error) {
|
||||||
}
|
}
|
||||||
cs, err := contentlocal.NewStore(csDir)
|
cs, err := contentlocal.NewStore(csDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
logrus.Warning("local cache import at " + csDir + " not found due to err: " + err.Error())
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
contentStores["local:"+csDir] = cs
|
|
||||||
|
|
||||||
// if digest is not specified, load from "latest" tag
|
// if digest is not specified, load from "latest" tag
|
||||||
if attrs["digest"] == "" {
|
if attrs["digest"] == "" {
|
||||||
idx, err := ociindex.ReadIndexJSONFileLocked(filepath.Join(csDir, "index.json"))
|
idx, err := ociindex.ReadIndexJSONFileLocked(filepath.Join(csDir, "index.json"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
logrus.Warning("local cache import at " + csDir + " not found due to err: " + err.Error())
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
for _, m := range idx.Manifests {
|
for _, m := range idx.Manifests {
|
||||||
if m.Annotations[ocispec.AnnotationRefName] == "latest" {
|
if (m.Annotations[ocispec.AnnotationRefName] == "latest" && attrs["tag"] == "") || (attrs["tag"] != "" && m.Annotations[ocispec.AnnotationRefName] == attrs["tag"]) {
|
||||||
attrs["digest"] = string(m.Digest)
|
attrs["digest"] = string(m.Digest)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if attrs["digest"] == "" {
|
if attrs["digest"] == "" {
|
||||||
return nil, errors.New("local cache importer requires either explicit digest or \"latest\" tag on index.json")
|
return nil, errors.New("local cache importer requires either explicit digest, \"latest\" tag or custom tag on index.json")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
contentStores["local:"+csDir] = cs
|
||||||
|
|
||||||
}
|
}
|
||||||
if im.Type == "registry" {
|
if im.Type == "registry" {
|
||||||
legacyImportRef := attrs["ref"]
|
legacyImportRef := attrs["ref"]
|
||||||
|
|
|
@ -3,6 +3,7 @@ package client
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
|
"github.com/moby/buildkit/client/llb"
|
||||||
"github.com/moby/buildkit/solver/pb"
|
"github.com/moby/buildkit/solver/pb"
|
||||||
"github.com/moby/buildkit/util/apicaps"
|
"github.com/moby/buildkit/util/apicaps"
|
||||||
digest "github.com/opencontainers/go-digest"
|
digest "github.com/opencontainers/go-digest"
|
||||||
|
@ -12,11 +13,13 @@ import (
|
||||||
|
|
||||||
type Client interface {
|
type Client interface {
|
||||||
Solve(ctx context.Context, req SolveRequest) (*Result, error)
|
Solve(ctx context.Context, req SolveRequest) (*Result, error)
|
||||||
ResolveImageConfig(ctx context.Context, ref string, opt ResolveImageConfigOpt) (digest.Digest, []byte, error)
|
ResolveImageConfig(ctx context.Context, ref string, opt llb.ResolveImageConfigOpt) (digest.Digest, []byte, error)
|
||||||
BuildOpts() BuildOpts
|
BuildOpts() BuildOpts
|
||||||
|
Inputs(ctx context.Context) (map[string]llb.State, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type Reference interface {
|
type Reference interface {
|
||||||
|
ToState() (llb.State, error)
|
||||||
ReadFile(ctx context.Context, req ReadRequest) ([]byte, error)
|
ReadFile(ctx context.Context, req ReadRequest) ([]byte, error)
|
||||||
StatFile(ctx context.Context, req StatRequest) (*fstypes.Stat, error)
|
StatFile(ctx context.Context, req StatRequest) (*fstypes.Stat, error)
|
||||||
ReadDir(ctx context.Context, req ReadDirRequest) ([]*fstypes.Stat, error)
|
ReadDir(ctx context.Context, req ReadDirRequest) ([]*fstypes.Stat, error)
|
||||||
|
@ -46,6 +49,7 @@ type SolveRequest struct {
|
||||||
Definition *pb.Definition
|
Definition *pb.Definition
|
||||||
Frontend string
|
Frontend string
|
||||||
FrontendOpt map[string]string
|
FrontendOpt map[string]string
|
||||||
|
FrontendInputs map[string]*pb.Definition
|
||||||
CacheImports []CacheOptionsEntry
|
CacheImports []CacheOptionsEntry
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,9 +72,3 @@ type BuildOpts struct {
|
||||||
LLBCaps apicaps.CapSet
|
LLBCaps apicaps.CapSet
|
||||||
Caps apicaps.CapSet
|
Caps apicaps.CapSet
|
||||||
}
|
}
|
||||||
|
|
||||||
type ResolveImageConfigOpt struct {
|
|
||||||
Platform *specs.Platform
|
|
||||||
ResolveMode string
|
|
||||||
LogName string
|
|
||||||
}
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gogo/googleapis/google/rpc"
|
"github.com/gogo/googleapis/google/rpc"
|
||||||
|
"github.com/moby/buildkit/client/llb"
|
||||||
"github.com/moby/buildkit/frontend/gateway/client"
|
"github.com/moby/buildkit/frontend/gateway/client"
|
||||||
pb "github.com/moby/buildkit/frontend/gateway/pb"
|
pb "github.com/moby/buildkit/frontend/gateway/pb"
|
||||||
opspb "github.com/moby/buildkit/solver/pb"
|
opspb "github.com/moby/buildkit/solver/pb"
|
||||||
|
@ -68,15 +69,15 @@ func current() (GrpcClient, error) {
|
||||||
return New(ctx, opts(), sessionID(), product(), pb.NewLLBBridgeClient(conn), workers())
|
return New(ctx, opts(), sessionID(), product(), pb.NewLLBBridgeClient(conn), workers())
|
||||||
}
|
}
|
||||||
|
|
||||||
func convertRef(ref client.Reference) (string, error) {
|
func convertRef(ref client.Reference) (*pb.Ref, error) {
|
||||||
if ref == nil {
|
if ref == nil {
|
||||||
return "", nil
|
return &pb.Ref{}, nil
|
||||||
}
|
}
|
||||||
r, ok := ref.(*reference)
|
r, ok := ref.(*reference)
|
||||||
if !ok {
|
if !ok {
|
||||||
return "", errors.Errorf("invalid return reference type %T", ref)
|
return nil, errors.Errorf("invalid return reference type %T", ref)
|
||||||
}
|
}
|
||||||
return r.id, nil
|
return &pb.Ref{Id: r.id, Def: r.def}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func RunFromEnvironment(ctx context.Context, f client.BuildFunc) error {
|
func RunFromEnvironment(ctx context.Context, f client.BuildFunc) error {
|
||||||
|
@ -105,22 +106,43 @@ func (c *grpcClient) Run(ctx context.Context, f client.BuildFunc) (retError erro
|
||||||
Metadata: res.Metadata,
|
Metadata: res.Metadata,
|
||||||
}
|
}
|
||||||
if res.Refs != nil {
|
if res.Refs != nil {
|
||||||
m := map[string]string{}
|
if c.caps.Supports(pb.CapProtoRefArray) == nil {
|
||||||
|
m := map[string]*pb.Ref{}
|
||||||
for k, r := range res.Refs {
|
for k, r := range res.Refs {
|
||||||
id, err := convertRef(r)
|
pbRef, err := convertRef(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
retError = err
|
retError = err
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
m[k] = id
|
m[k] = pbRef
|
||||||
}
|
}
|
||||||
pbRes.Result = &pb.Result_Refs{Refs: &pb.RefMap{Refs: m}}
|
pbRes.Result = &pb.Result_Refs{Refs: &pb.RefMap{Refs: m}}
|
||||||
} else {
|
} else {
|
||||||
id, err := convertRef(res.Ref)
|
// Server doesn't support the new wire format for refs, so we construct
|
||||||
|
// a deprecated result ref map.
|
||||||
|
m := map[string]string{}
|
||||||
|
for k, r := range res.Refs {
|
||||||
|
pbRef, err := convertRef(r)
|
||||||
|
if err != nil {
|
||||||
|
retError = err
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
m[k] = pbRef.Id
|
||||||
|
}
|
||||||
|
pbRes.Result = &pb.Result_RefsDeprecated{RefsDeprecated: &pb.RefMapDeprecated{Refs: m}}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
pbRef, err := convertRef(res.Ref)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
retError = err
|
retError = err
|
||||||
} else {
|
} else {
|
||||||
pbRes.Result = &pb.Result_Ref{Ref: id}
|
if c.caps.Supports(pb.CapProtoRefArray) == nil {
|
||||||
|
pbRes.Result = &pb.Result_Ref{Ref: pbRef}
|
||||||
|
} else {
|
||||||
|
// Server doesn't support the new wire format for refs, so we construct
|
||||||
|
// a deprecated result ref.
|
||||||
|
pbRes.Result = &pb.Result_RefDeprecated{RefDeprecated: pbRef.Id}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if retError == nil {
|
if retError == nil {
|
||||||
|
@ -283,7 +305,9 @@ func (c *grpcClient) Solve(ctx context.Context, creq client.SolveRequest) (*clie
|
||||||
Definition: creq.Definition,
|
Definition: creq.Definition,
|
||||||
Frontend: creq.Frontend,
|
Frontend: creq.Frontend,
|
||||||
FrontendOpt: creq.FrontendOpt,
|
FrontendOpt: creq.FrontendOpt,
|
||||||
|
FrontendInputs: creq.FrontendInputs,
|
||||||
AllowResultReturn: true,
|
AllowResultReturn: true,
|
||||||
|
AllowResultArrayRef: true,
|
||||||
// old API
|
// old API
|
||||||
ImportCacheRefsDeprecated: legacyRegistryCacheImports,
|
ImportCacheRefsDeprecated: legacyRegistryCacheImports,
|
||||||
// new API
|
// new API
|
||||||
|
@ -310,25 +334,44 @@ func (c *grpcClient) Solve(ctx context.Context, creq client.SolveRequest) (*clie
|
||||||
} else {
|
} else {
|
||||||
res.Metadata = resp.Result.Metadata
|
res.Metadata = resp.Result.Metadata
|
||||||
switch pbRes := resp.Result.Result.(type) {
|
switch pbRes := resp.Result.Result.(type) {
|
||||||
case *pb.Result_Ref:
|
case *pb.Result_RefDeprecated:
|
||||||
if id := pbRes.Ref; id != "" {
|
if id := pbRes.RefDeprecated; id != "" {
|
||||||
res.SetRef(&reference{id: id, c: c})
|
res.SetRef(&reference{id: id, c: c})
|
||||||
}
|
}
|
||||||
case *pb.Result_Refs:
|
case *pb.Result_RefsDeprecated:
|
||||||
for k, v := range pbRes.Refs.Refs {
|
for k, v := range pbRes.RefsDeprecated.Refs {
|
||||||
ref := &reference{id: v, c: c}
|
ref := &reference{id: v, c: c}
|
||||||
if v == "" {
|
if v == "" {
|
||||||
ref = nil
|
ref = nil
|
||||||
}
|
}
|
||||||
res.AddRef(k, ref)
|
res.AddRef(k, ref)
|
||||||
}
|
}
|
||||||
|
case *pb.Result_Ref:
|
||||||
|
if pbRes.Ref.Id != "" {
|
||||||
|
ref, err := newReference(c, pbRes.Ref)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
res.SetRef(ref)
|
||||||
|
}
|
||||||
|
case *pb.Result_Refs:
|
||||||
|
for k, v := range pbRes.Refs.Refs {
|
||||||
|
var ref *reference
|
||||||
|
if v.Id != "" {
|
||||||
|
ref, err = newReference(c, v)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
res.AddRef(k, ref)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *grpcClient) ResolveImageConfig(ctx context.Context, ref string, opt client.ResolveImageConfigOpt) (digest.Digest, []byte, error) {
|
func (c *grpcClient) ResolveImageConfig(ctx context.Context, ref string, opt llb.ResolveImageConfigOpt) (digest.Digest, []byte, error) {
|
||||||
var p *opspb.Platform
|
var p *opspb.Platform
|
||||||
if platform := opt.Platform; platform != nil {
|
if platform := opt.Platform; platform != nil {
|
||||||
p = &opspb.Platform{
|
p = &opspb.Platform{
|
||||||
|
@ -357,9 +400,56 @@ func (c *grpcClient) BuildOpts() client.BuildOpts {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *grpcClient) Inputs(ctx context.Context) (map[string]llb.State, error) {
|
||||||
|
err := c.caps.Supports(pb.CapFrontendInputs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := c.client.Inputs(ctx, &pb.InputsRequest{})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
inputs := make(map[string]llb.State)
|
||||||
|
for key, def := range resp.Definitions {
|
||||||
|
op, err := llb.NewDefinitionOp(def)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
inputs[key] = llb.NewState(op)
|
||||||
|
}
|
||||||
|
return inputs, nil
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
type reference struct {
|
type reference struct {
|
||||||
id string
|
|
||||||
c *grpcClient
|
c *grpcClient
|
||||||
|
id string
|
||||||
|
def *opspb.Definition
|
||||||
|
output llb.Output
|
||||||
|
}
|
||||||
|
|
||||||
|
func newReference(c *grpcClient, ref *pb.Ref) (*reference, error) {
|
||||||
|
return &reference{c: c, id: ref.Id, def: ref.Def}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *reference) ToState() (st llb.State, err error) {
|
||||||
|
err = r.c.caps.Supports(pb.CapReferenceOutput)
|
||||||
|
if err != nil {
|
||||||
|
return st, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.def == nil {
|
||||||
|
return st, errors.Errorf("gateway did not return reference with definition")
|
||||||
|
}
|
||||||
|
|
||||||
|
defop, err := llb.NewDefinitionOp(r.def)
|
||||||
|
if err != nil {
|
||||||
|
return st, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return llb.NewState(defop), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *reference) ReadFile(ctx context.Context, req client.ReadRequest) ([]byte, error) {
|
func (r *reference) ReadFile(ctx context.Context, req client.ReadRequest) ([]byte, error) {
|
||||||
|
|
|
@ -19,6 +19,19 @@ const (
|
||||||
CapReadDir apicaps.CapID = "readdir"
|
CapReadDir apicaps.CapID = "readdir"
|
||||||
CapStatFile apicaps.CapID = "statfile"
|
CapStatFile apicaps.CapID = "statfile"
|
||||||
CapImportCaches apicaps.CapID = "importcaches"
|
CapImportCaches apicaps.CapID = "importcaches"
|
||||||
|
|
||||||
|
// CapProtoRefArray is a capability to return arrays of refs instead of single
|
||||||
|
// refs. This capability is only for the wire format change and shouldn't be
|
||||||
|
// used in frontends for feature detection.
|
||||||
|
CapProtoRefArray apicaps.CapID = "proto.refarray"
|
||||||
|
|
||||||
|
// CapReferenceOutput is a capability to use a reference of a solved result as
|
||||||
|
// an llb.Output.
|
||||||
|
CapReferenceOutput apicaps.CapID = "reference.output"
|
||||||
|
|
||||||
|
// CapFrontendInputs is a capability to request frontend inputs from the
|
||||||
|
// LLBBridge GRPC server.
|
||||||
|
CapFrontendInputs apicaps.CapID = "frontend.inputs"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -92,4 +105,25 @@ func init() {
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
Status: apicaps.CapStatusExperimental,
|
Status: apicaps.CapStatusExperimental,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Caps.Init(apicaps.Cap{
|
||||||
|
ID: CapProtoRefArray,
|
||||||
|
Name: "wire format ref arrays",
|
||||||
|
Enabled: true,
|
||||||
|
Status: apicaps.CapStatusExperimental,
|
||||||
|
})
|
||||||
|
|
||||||
|
Caps.Init(apicaps.Cap{
|
||||||
|
ID: CapReferenceOutput,
|
||||||
|
Name: "reference output",
|
||||||
|
Enabled: true,
|
||||||
|
Status: apicaps.CapStatusExperimental,
|
||||||
|
})
|
||||||
|
|
||||||
|
Caps.Init(apicaps.Cap{
|
||||||
|
ID: CapFrontendInputs,
|
||||||
|
Name: "frontend inputs",
|
||||||
|
Enabled: true,
|
||||||
|
Status: apicaps.CapStatusExperimental,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -26,20 +26,35 @@ service LLBBridge {
|
||||||
rpc StatFile(StatFileRequest) returns (StatFileResponse);
|
rpc StatFile(StatFileRequest) returns (StatFileResponse);
|
||||||
rpc Ping(PingRequest) returns (PongResponse);
|
rpc Ping(PingRequest) returns (PongResponse);
|
||||||
rpc Return(ReturnRequest) returns (ReturnResponse);
|
rpc Return(ReturnRequest) returns (ReturnResponse);
|
||||||
|
// apicaps:CapFrontendInputs
|
||||||
|
rpc Inputs(InputsRequest) returns (InputsResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message Result {
|
message Result {
|
||||||
oneof result {
|
oneof result {
|
||||||
string ref = 1;
|
// Deprecated non-array refs.
|
||||||
RefMap refs = 2;
|
string refDeprecated = 1;
|
||||||
|
RefMapDeprecated refsDeprecated = 2;
|
||||||
|
|
||||||
|
Ref ref = 3;
|
||||||
|
RefMap refs = 4;
|
||||||
}
|
}
|
||||||
map<string, bytes> metadata = 10;
|
map<string, bytes> metadata = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
message RefMap {
|
message RefMapDeprecated {
|
||||||
map<string, string> refs = 1;
|
map<string, string> refs = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
message Ref {
|
||||||
|
string id = 1;
|
||||||
|
pb.Definition def = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message RefMap {
|
||||||
|
map<string, Ref> refs = 1;
|
||||||
|
}
|
||||||
|
|
||||||
message ReturnRequest {
|
message ReturnRequest {
|
||||||
Result result = 1;
|
Result result = 1;
|
||||||
google.rpc.Status error = 2;
|
google.rpc.Status error = 2;
|
||||||
|
@ -48,6 +63,13 @@ message ReturnRequest {
|
||||||
message ReturnResponse {
|
message ReturnResponse {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
message InputsRequest {
|
||||||
|
}
|
||||||
|
|
||||||
|
message InputsResponse {
|
||||||
|
map<string, pb.Definition> Definitions = 1;
|
||||||
|
}
|
||||||
|
|
||||||
message ResolveImageConfigRequest {
|
message ResolveImageConfigRequest {
|
||||||
string Ref = 1;
|
string Ref = 1;
|
||||||
pb.Platform Platform = 2;
|
pb.Platform Platform = 2;
|
||||||
|
@ -70,6 +92,7 @@ message SolveRequest {
|
||||||
// for each of the ImportCacheRefs entry to CacheImports for compatibility. (planned to be removed)
|
// for each of the ImportCacheRefs entry to CacheImports for compatibility. (planned to be removed)
|
||||||
repeated string ImportCacheRefsDeprecated = 4;
|
repeated string ImportCacheRefsDeprecated = 4;
|
||||||
bool allowResultReturn = 5;
|
bool allowResultReturn = 5;
|
||||||
|
bool allowResultArrayRef = 6;
|
||||||
|
|
||||||
// apicaps.CapSolveInlineReturn deprecated
|
// apicaps.CapSolveInlineReturn deprecated
|
||||||
bool Final = 10;
|
bool Final = 10;
|
||||||
|
@ -77,6 +100,9 @@ message SolveRequest {
|
||||||
// CacheImports was added in BuildKit v0.4.0.
|
// CacheImports was added in BuildKit v0.4.0.
|
||||||
// apicaps:CapImportCaches
|
// apicaps:CapImportCaches
|
||||||
repeated CacheOptionsEntry CacheImports = 12;
|
repeated CacheOptionsEntry CacheImports = 12;
|
||||||
|
|
||||||
|
// apicaps:CapFrontendInputs
|
||||||
|
map<string, pb.Definition> FrontendInputs = 13;
|
||||||
}
|
}
|
||||||
|
|
||||||
// CacheOptionsEntry corresponds to the control.CacheOptionsEntry
|
// CacheOptionsEntry corresponds to the control.CacheOptionsEntry
|
||||||
|
|
|
@ -1,79 +1,83 @@
|
||||||
module github.com/moby/buildkit
|
module github.com/moby/buildkit
|
||||||
|
|
||||||
go 1.11
|
go 1.13
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/AkihiroSuda/containerd-fuse-overlayfs v0.0.0-20200220082720-bb896865146c
|
||||||
github.com/BurntSushi/toml v0.3.1
|
github.com/BurntSushi/toml v0.3.1
|
||||||
github.com/Microsoft/go-winio v0.4.14
|
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
|
||||||
|
github.com/Microsoft/hcsshim v0.8.7 // indirect
|
||||||
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 // indirect
|
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 // indirect
|
||||||
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
|
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
|
||||||
github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601 // indirect
|
github.com/containerd/cgroups v0.0.0-20200217135630-d732e370d46d // indirect
|
||||||
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50
|
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d
|
||||||
github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf
|
github.com/containerd/containerd v1.4.0-0
|
||||||
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6
|
github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41
|
||||||
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c // indirect
|
github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00 // indirect
|
||||||
github.com/containerd/go-cni v0.0.0-20190813230227-49fbd9b210f3
|
github.com/containerd/go-cni v0.0.0-20200107172653-c154a49e2c75
|
||||||
github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda
|
github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328
|
||||||
github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8 // indirect
|
github.com/containerd/ttrpc v0.0.0-20200121165050-0be804eadb15 // indirect
|
||||||
github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd // indirect
|
github.com/containerd/typeurl v0.0.0-20200205145503-b45ef1f1f737 // indirect
|
||||||
github.com/containernetworking/cni v0.7.1 // indirect
|
github.com/coreos/go-systemd/v22 v22.0.0
|
||||||
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a
|
github.com/docker/cli v0.0.0-20200227165822-2298e6a3fe24
|
||||||
github.com/docker/cli v0.0.0-20190321234815-f40f9c240ab0
|
github.com/docker/distribution v0.0.0-20200223014041-6b972e50feee
|
||||||
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
|
github.com/docker/docker v0.0.0
|
||||||
github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c
|
|
||||||
github.com/docker/docker-credential-helpers v0.6.0 // indirect
|
github.com/docker/docker-credential-helpers v0.6.0 // indirect
|
||||||
github.com/docker/go-connections v0.3.0
|
github.com/docker/go-connections v0.3.0
|
||||||
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
|
github.com/docker/libnetwork v0.8.0-dev.2.0.20200226230617-d8334ccdb9be
|
||||||
github.com/docker/libnetwork v0.8.0-dev.2.0.20190604151032-3c26b4e7495e
|
|
||||||
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f // indirect
|
|
||||||
github.com/gofrs/flock v0.7.0
|
github.com/gofrs/flock v0.7.0
|
||||||
github.com/gogo/googleapis v1.1.0
|
github.com/gogo/googleapis v1.3.2
|
||||||
github.com/gogo/protobuf v1.2.0
|
github.com/gogo/protobuf v1.3.1
|
||||||
github.com/golang/protobuf v1.2.0
|
github.com/golang/protobuf v1.3.3
|
||||||
github.com/google/go-cmp v0.3.0
|
github.com/google/go-cmp v0.3.1
|
||||||
github.com/google/shlex v0.0.0-20150127133951-6f45313302b9
|
github.com/google/shlex v0.0.0-20150127133951-6f45313302b9
|
||||||
|
github.com/google/uuid v1.1.1 // indirect
|
||||||
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
|
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
|
||||||
github.com/hashicorp/go-immutable-radix v1.0.0
|
github.com/hashicorp/go-immutable-radix v1.0.0
|
||||||
github.com/hashicorp/golang-lru v0.0.0-20160207214719-a0d98a5f2880
|
github.com/hashicorp/golang-lru v0.5.1
|
||||||
github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c // indirect
|
github.com/hashicorp/uuid v0.0.0-20160311170451-ebb0a03e909c // indirect
|
||||||
github.com/imdario/mergo v0.3.7 // indirect
|
github.com/imdario/mergo v0.3.7 // indirect
|
||||||
github.com/ishidawataru/sctp v0.0.0-20180213033435-07191f837fed // indirect
|
github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect
|
||||||
github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea
|
github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea
|
||||||
github.com/kr/pretty v0.1.0 // indirect
|
|
||||||
github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452
|
github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452
|
||||||
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c
|
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c
|
||||||
github.com/opencontainers/go-digest v1.0.0-rc1
|
github.com/opencontainers/go-digest v1.0.0-rc1
|
||||||
github.com/opencontainers/image-spec v1.0.1
|
github.com/opencontainers/image-spec v1.0.1
|
||||||
github.com/opencontainers/runc v1.0.0-rc8.0.20190621203724-f4982d86f7fd
|
github.com/opencontainers/runc v1.0.0-rc9.0.20200221051241-688cf6d43cc4
|
||||||
github.com/opencontainers/runtime-spec v0.0.0-20180909173843-eba862dc2470
|
github.com/opencontainers/runtime-spec v1.0.1
|
||||||
|
github.com/opencontainers/selinux v1.3.2 // indirect
|
||||||
github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75
|
github.com/opentracing-contrib/go-stdlib v0.0.0-20171029140428-b1a47cfbdd75
|
||||||
github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be
|
github.com/opentracing/opentracing-go v0.0.0-20171003133519-1361b9cd60be
|
||||||
github.com/pkg/errors v0.8.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/pkg/profile v1.2.1
|
github.com/pkg/profile v1.2.1
|
||||||
github.com/prometheus/procfs v0.0.3 // indirect
|
|
||||||
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
|
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
|
||||||
github.com/sirupsen/logrus v1.4.1
|
github.com/sirupsen/logrus v1.4.2
|
||||||
github.com/stretchr/testify v1.3.0
|
github.com/stretchr/testify v1.4.0
|
||||||
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
|
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
|
||||||
github.com/tonistiigi/fsutil v0.0.0-20190819224149-3d2716dd0a4d
|
github.com/tonistiigi/fsutil v0.0.0-20200326231323-c2c7d7b0e144
|
||||||
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
|
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
|
||||||
github.com/uber/jaeger-client-go v0.0.0-20180103221425-e02c85f9069e
|
github.com/uber/jaeger-client-go v0.0.0-20180103221425-e02c85f9069e
|
||||||
github.com/uber/jaeger-lib v1.2.1 // indirect
|
github.com/uber/jaeger-lib v1.2.1 // indirect
|
||||||
github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5
|
github.com/urfave/cli v1.22.2
|
||||||
github.com/vishvananda/netlink v1.0.0 // indirect
|
github.com/vishvananda/netlink v1.0.0 // indirect
|
||||||
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
|
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
|
||||||
go.etcd.io/bbolt v1.3.3
|
go.etcd.io/bbolt v1.3.3
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
|
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
|
||||||
golang.org/x/net v0.0.0-20190522155817-f3200d17e092
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
|
||||||
golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e
|
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae
|
||||||
golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
|
||||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8
|
google.golang.org/genproto v0.0.0-20200227132054-3f1135a288c9
|
||||||
google.golang.org/grpc v1.23.0
|
google.golang.org/grpc v1.27.1
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
|
||||||
gotest.tools v2.2.0+incompatible
|
gotest.tools v2.2.0+incompatible
|
||||||
|
gotest.tools/v3 v3.0.2 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
replace github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
|
replace github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
|
||||||
|
|
||||||
replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
|
replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
|
||||||
|
|
||||||
|
replace github.com/containerd/containerd => github.com/containerd/containerd v1.3.1-0.20200227195959-4d242818bf55
|
||||||
|
|
||||||
|
replace github.com/docker/docker => github.com/docker/docker v1.4.2-0.20200227233006-38f52c9fec82
|
||||||
|
|
|
@ -3,20 +3,20 @@
|
||||||
|
|
||||||
package auth
|
package auth
|
||||||
|
|
||||||
import proto "github.com/gogo/protobuf/proto"
|
|
||||||
import fmt "fmt"
|
|
||||||
import math "math"
|
|
||||||
|
|
||||||
import strings "strings"
|
|
||||||
import reflect "reflect"
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
context "golang.org/x/net/context"
|
context "context"
|
||||||
|
fmt "fmt"
|
||||||
|
proto "github.com/gogo/protobuf/proto"
|
||||||
grpc "google.golang.org/grpc"
|
grpc "google.golang.org/grpc"
|
||||||
|
codes "google.golang.org/grpc/codes"
|
||||||
|
status "google.golang.org/grpc/status"
|
||||||
|
io "io"
|
||||||
|
math "math"
|
||||||
|
math_bits "math/bits"
|
||||||
|
reflect "reflect"
|
||||||
|
strings "strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
import io "io"
|
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
var _ = fmt.Errorf
|
var _ = fmt.Errorf
|
||||||
|
@ -26,7 +26,7 @@ var _ = math.Inf
|
||||||
// is compatible with the proto package it is being compiled against.
|
// is compatible with the proto package it is being compiled against.
|
||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
type CredentialsRequest struct {
|
type CredentialsRequest struct {
|
||||||
Host string `protobuf:"bytes,1,opt,name=Host,proto3" json:"Host,omitempty"`
|
Host string `protobuf:"bytes,1,opt,name=Host,proto3" json:"Host,omitempty"`
|
||||||
|
@ -35,7 +35,7 @@ type CredentialsRequest struct {
|
||||||
func (m *CredentialsRequest) Reset() { *m = CredentialsRequest{} }
|
func (m *CredentialsRequest) Reset() { *m = CredentialsRequest{} }
|
||||||
func (*CredentialsRequest) ProtoMessage() {}
|
func (*CredentialsRequest) ProtoMessage() {}
|
||||||
func (*CredentialsRequest) Descriptor() ([]byte, []int) {
|
func (*CredentialsRequest) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_auth_0215b2f0213c0d57, []int{0}
|
return fileDescriptor_8bbd6f3875b0e874, []int{0}
|
||||||
}
|
}
|
||||||
func (m *CredentialsRequest) XXX_Unmarshal(b []byte) error {
|
func (m *CredentialsRequest) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -45,15 +45,15 @@ func (m *CredentialsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte,
|
||||||
return xxx_messageInfo_CredentialsRequest.Marshal(b, m, deterministic)
|
return xxx_messageInfo_CredentialsRequest.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *CredentialsRequest) XXX_Merge(src proto.Message) {
|
func (m *CredentialsRequest) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_CredentialsRequest.Merge(dst, src)
|
xxx_messageInfo_CredentialsRequest.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *CredentialsRequest) XXX_Size() int {
|
func (m *CredentialsRequest) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -79,7 +79,7 @@ type CredentialsResponse struct {
|
||||||
func (m *CredentialsResponse) Reset() { *m = CredentialsResponse{} }
|
func (m *CredentialsResponse) Reset() { *m = CredentialsResponse{} }
|
||||||
func (*CredentialsResponse) ProtoMessage() {}
|
func (*CredentialsResponse) ProtoMessage() {}
|
||||||
func (*CredentialsResponse) Descriptor() ([]byte, []int) {
|
func (*CredentialsResponse) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_auth_0215b2f0213c0d57, []int{1}
|
return fileDescriptor_8bbd6f3875b0e874, []int{1}
|
||||||
}
|
}
|
||||||
func (m *CredentialsResponse) XXX_Unmarshal(b []byte) error {
|
func (m *CredentialsResponse) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -89,15 +89,15 @@ func (m *CredentialsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte,
|
||||||
return xxx_messageInfo_CredentialsResponse.Marshal(b, m, deterministic)
|
return xxx_messageInfo_CredentialsResponse.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *CredentialsResponse) XXX_Merge(src proto.Message) {
|
func (m *CredentialsResponse) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_CredentialsResponse.Merge(dst, src)
|
xxx_messageInfo_CredentialsResponse.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *CredentialsResponse) XXX_Size() int {
|
func (m *CredentialsResponse) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -126,6 +126,28 @@ func init() {
|
||||||
proto.RegisterType((*CredentialsRequest)(nil), "moby.filesync.v1.CredentialsRequest")
|
proto.RegisterType((*CredentialsRequest)(nil), "moby.filesync.v1.CredentialsRequest")
|
||||||
proto.RegisterType((*CredentialsResponse)(nil), "moby.filesync.v1.CredentialsResponse")
|
proto.RegisterType((*CredentialsResponse)(nil), "moby.filesync.v1.CredentialsResponse")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() { proto.RegisterFile("auth.proto", fileDescriptor_8bbd6f3875b0e874) }
|
||||||
|
|
||||||
|
var fileDescriptor_8bbd6f3875b0e874 = []byte{
|
||||||
|
// 233 bytes of a gzipped FileDescriptorProto
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0x2c, 0x2d, 0xc9,
|
||||||
|
0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xc8, 0xcd, 0x4f, 0xaa, 0xd4, 0x4b, 0xcb, 0xcc,
|
||||||
|
0x49, 0x2d, 0xae, 0xcc, 0x4b, 0xd6, 0x2b, 0x33, 0x54, 0xd2, 0xe0, 0x12, 0x72, 0x2e, 0x4a, 0x4d,
|
||||||
|
0x49, 0xcd, 0x2b, 0xc9, 0x4c, 0xcc, 0x29, 0x0e, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x12,
|
||||||
|
0xe2, 0x62, 0xf1, 0xc8, 0x2f, 0x2e, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x95,
|
||||||
|
0x3c, 0xb9, 0x84, 0x51, 0x54, 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x0a, 0x49, 0x71, 0x71, 0x84,
|
||||||
|
0x16, 0xa7, 0x16, 0xe5, 0x25, 0xe6, 0xa6, 0x42, 0x95, 0xc3, 0xf9, 0x42, 0x62, 0x5c, 0x6c, 0xc1,
|
||||||
|
0xa9, 0xc9, 0x45, 0xa9, 0x25, 0x12, 0x4c, 0x60, 0x19, 0x28, 0xcf, 0x28, 0x89, 0x8b, 0xc5, 0xb1,
|
||||||
|
0xb4, 0x24, 0x43, 0x28, 0x8a, 0x8b, 0x1b, 0xc9, 0x48, 0x21, 0x15, 0x3d, 0x74, 0xe7, 0xe9, 0x61,
|
||||||
|
0xba, 0x4d, 0x4a, 0x95, 0x80, 0x2a, 0x88, 0xbb, 0x9c, 0xac, 0x2e, 0x3c, 0x94, 0x63, 0xb8, 0xf1,
|
||||||
|
0x50, 0x8e, 0xe1, 0xc3, 0x43, 0x39, 0xc6, 0x86, 0x47, 0x72, 0x8c, 0x2b, 0x1e, 0xc9, 0x31, 0x9e,
|
||||||
|
0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x2f, 0x1e, 0xc9, 0x31,
|
||||||
|
0x7c, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb,
|
||||||
|
0x31, 0x44, 0xb1, 0x80, 0x02, 0x2b, 0x89, 0x0d, 0x1c, 0x5a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
|
||||||
|
0xff, 0x64, 0x61, 0x71, 0x59, 0x3b, 0x01, 0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
func (this *CredentialsRequest) Equal(that interface{}) bool {
|
func (this *CredentialsRequest) Equal(that interface{}) bool {
|
||||||
if that == nil {
|
if that == nil {
|
||||||
return this == nil
|
return this == nil
|
||||||
|
@ -244,6 +266,14 @@ type AuthServer interface {
|
||||||
Credentials(context.Context, *CredentialsRequest) (*CredentialsResponse, error)
|
Credentials(context.Context, *CredentialsRequest) (*CredentialsResponse, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnimplementedAuthServer can be embedded to have forward compatible implementations.
|
||||||
|
type UnimplementedAuthServer struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UnimplementedAuthServer) Credentials(ctx context.Context, req *CredentialsRequest) (*CredentialsResponse, error) {
|
||||||
|
return nil, status.Errorf(codes.Unimplemented, "method Credentials not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterAuthServer(s *grpc.Server, srv AuthServer) {
|
func RegisterAuthServer(s *grpc.Server, srv AuthServer) {
|
||||||
s.RegisterService(&_Auth_serviceDesc, srv)
|
s.RegisterService(&_Auth_serviceDesc, srv)
|
||||||
}
|
}
|
||||||
|
@ -282,7 +312,7 @@ var _Auth_serviceDesc = grpc.ServiceDesc{
|
||||||
func (m *CredentialsRequest) Marshal() (dAtA []byte, err error) {
|
func (m *CredentialsRequest) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -290,23 +320,29 @@ func (m *CredentialsRequest) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CredentialsRequest) MarshalTo(dAtA []byte) (int, error) {
|
func (m *CredentialsRequest) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *CredentialsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.Host) > 0 {
|
if len(m.Host) > 0 {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.Host)
|
||||||
i++
|
copy(dAtA[i:], m.Host)
|
||||||
i = encodeVarintAuth(dAtA, i, uint64(len(m.Host)))
|
i = encodeVarintAuth(dAtA, i, uint64(len(m.Host)))
|
||||||
i += copy(dAtA[i:], m.Host)
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
}
|
}
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CredentialsResponse) Marshal() (dAtA []byte, err error) {
|
func (m *CredentialsResponse) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -314,33 +350,42 @@ func (m *CredentialsResponse) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CredentialsResponse) MarshalTo(dAtA []byte) (int, error) {
|
func (m *CredentialsResponse) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *CredentialsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.Username) > 0 {
|
|
||||||
dAtA[i] = 0xa
|
|
||||||
i++
|
|
||||||
i = encodeVarintAuth(dAtA, i, uint64(len(m.Username)))
|
|
||||||
i += copy(dAtA[i:], m.Username)
|
|
||||||
}
|
|
||||||
if len(m.Secret) > 0 {
|
if len(m.Secret) > 0 {
|
||||||
dAtA[i] = 0x12
|
i -= len(m.Secret)
|
||||||
i++
|
copy(dAtA[i:], m.Secret)
|
||||||
i = encodeVarintAuth(dAtA, i, uint64(len(m.Secret)))
|
i = encodeVarintAuth(dAtA, i, uint64(len(m.Secret)))
|
||||||
i += copy(dAtA[i:], m.Secret)
|
i--
|
||||||
|
dAtA[i] = 0x12
|
||||||
}
|
}
|
||||||
return i, nil
|
if len(m.Username) > 0 {
|
||||||
|
i -= len(m.Username)
|
||||||
|
copy(dAtA[i:], m.Username)
|
||||||
|
i = encodeVarintAuth(dAtA, i, uint64(len(m.Username)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
|
}
|
||||||
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeVarintAuth(dAtA []byte, offset int, v uint64) int {
|
func encodeVarintAuth(dAtA []byte, offset int, v uint64) int {
|
||||||
|
offset -= sovAuth(v)
|
||||||
|
base := offset
|
||||||
for v >= 1<<7 {
|
for v >= 1<<7 {
|
||||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||||
v >>= 7
|
v >>= 7
|
||||||
offset++
|
offset++
|
||||||
}
|
}
|
||||||
dAtA[offset] = uint8(v)
|
dAtA[offset] = uint8(v)
|
||||||
return offset + 1
|
return base
|
||||||
}
|
}
|
||||||
func (m *CredentialsRequest) Size() (n int) {
|
func (m *CredentialsRequest) Size() (n int) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -373,14 +418,7 @@ func (m *CredentialsResponse) Size() (n int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sovAuth(x uint64) (n int) {
|
func sovAuth(x uint64) (n int) {
|
||||||
for {
|
return (math_bits.Len64(x|1) + 6) / 7
|
||||||
n++
|
|
||||||
x >>= 7
|
|
||||||
if x == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n
|
|
||||||
}
|
}
|
||||||
func sozAuth(x uint64) (n int) {
|
func sozAuth(x uint64) (n int) {
|
||||||
return sovAuth(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
return sovAuth(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
||||||
|
@ -429,7 +467,7 @@ func (m *CredentialsRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -457,7 +495,7 @@ func (m *CredentialsRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -467,6 +505,9 @@ func (m *CredentialsRequest) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthAuth
|
return ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthAuth
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -481,6 +522,9 @@ func (m *CredentialsRequest) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthAuth
|
return ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthAuth
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -508,7 +552,7 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -536,7 +580,7 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -546,6 +590,9 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthAuth
|
return ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthAuth
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -565,7 +612,7 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -575,6 +622,9 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthAuth
|
return ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthAuth
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -589,6 +639,9 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthAuth
|
return ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthAuth
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -604,6 +657,7 @@ func (m *CredentialsResponse) Unmarshal(dAtA []byte) error {
|
||||||
func skipAuth(dAtA []byte) (n int, err error) {
|
func skipAuth(dAtA []byte) (n int, err error) {
|
||||||
l := len(dAtA)
|
l := len(dAtA)
|
||||||
iNdEx := 0
|
iNdEx := 0
|
||||||
|
depth := 0
|
||||||
for iNdEx < l {
|
for iNdEx < l {
|
||||||
var wire uint64
|
var wire uint64
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -635,10 +689,8 @@ func skipAuth(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
|
||||||
case 1:
|
case 1:
|
||||||
iNdEx += 8
|
iNdEx += 8
|
||||||
return iNdEx, nil
|
|
||||||
case 2:
|
case 2:
|
||||||
var length int
|
var length int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -655,74 +707,34 @@ func skipAuth(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
iNdEx += length
|
|
||||||
if length < 0 {
|
if length < 0 {
|
||||||
return 0, ErrInvalidLengthAuth
|
return 0, ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
iNdEx += length
|
||||||
case 3:
|
case 3:
|
||||||
for {
|
depth++
|
||||||
var innerWire uint64
|
|
||||||
var start int = iNdEx
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return 0, ErrIntOverflowAuth
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return 0, io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
innerWire |= (uint64(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
innerWireType := int(innerWire & 0x7)
|
|
||||||
if innerWireType == 4 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
next, err := skipAuth(dAtA[start:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
iNdEx = start + next
|
|
||||||
}
|
|
||||||
return iNdEx, nil
|
|
||||||
case 4:
|
case 4:
|
||||||
return iNdEx, nil
|
if depth == 0 {
|
||||||
|
return 0, ErrUnexpectedEndOfGroupAuth
|
||||||
|
}
|
||||||
|
depth--
|
||||||
case 5:
|
case 5:
|
||||||
iNdEx += 4
|
iNdEx += 4
|
||||||
return iNdEx, nil
|
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
||||||
}
|
}
|
||||||
|
if iNdEx < 0 {
|
||||||
|
return 0, ErrInvalidLengthAuth
|
||||||
}
|
}
|
||||||
panic("unreachable")
|
if depth == 0 {
|
||||||
|
return iNdEx, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrInvalidLengthAuth = fmt.Errorf("proto: negative length found during unmarshaling")
|
ErrInvalidLengthAuth = fmt.Errorf("proto: negative length found during unmarshaling")
|
||||||
ErrIntOverflowAuth = fmt.Errorf("proto: integer overflow")
|
ErrIntOverflowAuth = fmt.Errorf("proto: integer overflow")
|
||||||
|
ErrUnexpectedEndOfGroupAuth = fmt.Errorf("proto: unexpected end of group")
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() { proto.RegisterFile("auth.proto", fileDescriptor_auth_0215b2f0213c0d57) }
|
|
||||||
|
|
||||||
var fileDescriptor_auth_0215b2f0213c0d57 = []byte{
|
|
||||||
// 233 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0x2c, 0x2d, 0xc9,
|
|
||||||
0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xc8, 0xcd, 0x4f, 0xaa, 0xd4, 0x4b, 0xcb, 0xcc,
|
|
||||||
0x49, 0x2d, 0xae, 0xcc, 0x4b, 0xd6, 0x2b, 0x33, 0x54, 0xd2, 0xe0, 0x12, 0x72, 0x2e, 0x4a, 0x4d,
|
|
||||||
0x49, 0xcd, 0x2b, 0xc9, 0x4c, 0xcc, 0x29, 0x0e, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x11, 0x12,
|
|
||||||
0xe2, 0x62, 0xf1, 0xc8, 0x2f, 0x2e, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x95,
|
|
||||||
0x3c, 0xb9, 0x84, 0x51, 0x54, 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x0a, 0x49, 0x71, 0x71, 0x84,
|
|
||||||
0x16, 0xa7, 0x16, 0xe5, 0x25, 0xe6, 0xa6, 0x42, 0x95, 0xc3, 0xf9, 0x42, 0x62, 0x5c, 0x6c, 0xc1,
|
|
||||||
0xa9, 0xc9, 0x45, 0xa9, 0x25, 0x12, 0x4c, 0x60, 0x19, 0x28, 0xcf, 0x28, 0x89, 0x8b, 0xc5, 0xb1,
|
|
||||||
0xb4, 0x24, 0x43, 0x28, 0x8a, 0x8b, 0x1b, 0xc9, 0x48, 0x21, 0x15, 0x3d, 0x74, 0xe7, 0xe9, 0x61,
|
|
||||||
0xba, 0x4d, 0x4a, 0x95, 0x80, 0x2a, 0x88, 0xbb, 0x9c, 0xac, 0x2e, 0x3c, 0x94, 0x63, 0xb8, 0xf1,
|
|
||||||
0x50, 0x8e, 0xe1, 0xc3, 0x43, 0x39, 0xc6, 0x86, 0x47, 0x72, 0x8c, 0x2b, 0x1e, 0xc9, 0x31, 0x9e,
|
|
||||||
0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x2f, 0x1e, 0xc9, 0x31,
|
|
||||||
0x7c, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb,
|
|
||||||
0x31, 0x44, 0xb1, 0x80, 0x02, 0x2b, 0x89, 0x0d, 0x1c, 0x5a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
|
|
||||||
0xff, 0x64, 0x61, 0x71, 0x59, 0x3b, 0x01, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
|
|
|
@ -3,22 +3,21 @@
|
||||||
|
|
||||||
package filesync
|
package filesync
|
||||||
|
|
||||||
import proto "github.com/gogo/protobuf/proto"
|
|
||||||
import fmt "fmt"
|
|
||||||
import math "math"
|
|
||||||
|
|
||||||
import bytes "bytes"
|
|
||||||
|
|
||||||
import strings "strings"
|
|
||||||
import reflect "reflect"
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
context "golang.org/x/net/context"
|
bytes "bytes"
|
||||||
|
context "context"
|
||||||
|
fmt "fmt"
|
||||||
|
proto "github.com/gogo/protobuf/proto"
|
||||||
grpc "google.golang.org/grpc"
|
grpc "google.golang.org/grpc"
|
||||||
|
codes "google.golang.org/grpc/codes"
|
||||||
|
status "google.golang.org/grpc/status"
|
||||||
|
io "io"
|
||||||
|
math "math"
|
||||||
|
math_bits "math/bits"
|
||||||
|
reflect "reflect"
|
||||||
|
strings "strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
import io "io"
|
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
var _ = fmt.Errorf
|
var _ = fmt.Errorf
|
||||||
|
@ -28,7 +27,7 @@ var _ = math.Inf
|
||||||
// is compatible with the proto package it is being compiled against.
|
// is compatible with the proto package it is being compiled against.
|
||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
// BytesMessage contains a chunk of byte data
|
// BytesMessage contains a chunk of byte data
|
||||||
type BytesMessage struct {
|
type BytesMessage struct {
|
||||||
|
@ -38,7 +37,7 @@ type BytesMessage struct {
|
||||||
func (m *BytesMessage) Reset() { *m = BytesMessage{} }
|
func (m *BytesMessage) Reset() { *m = BytesMessage{} }
|
||||||
func (*BytesMessage) ProtoMessage() {}
|
func (*BytesMessage) ProtoMessage() {}
|
||||||
func (*BytesMessage) Descriptor() ([]byte, []int) {
|
func (*BytesMessage) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_filesync_26f8b7bce2e5ac0e, []int{0}
|
return fileDescriptor_d1042549f1f24495, []int{0}
|
||||||
}
|
}
|
||||||
func (m *BytesMessage) XXX_Unmarshal(b []byte) error {
|
func (m *BytesMessage) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -48,15 +47,15 @@ func (m *BytesMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
|
||||||
return xxx_messageInfo_BytesMessage.Marshal(b, m, deterministic)
|
return xxx_messageInfo_BytesMessage.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *BytesMessage) XXX_Merge(src proto.Message) {
|
func (m *BytesMessage) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_BytesMessage.Merge(dst, src)
|
xxx_messageInfo_BytesMessage.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *BytesMessage) XXX_Size() int {
|
func (m *BytesMessage) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -77,6 +76,27 @@ func (m *BytesMessage) GetData() []byte {
|
||||||
func init() {
|
func init() {
|
||||||
proto.RegisterType((*BytesMessage)(nil), "moby.filesync.v1.BytesMessage")
|
proto.RegisterType((*BytesMessage)(nil), "moby.filesync.v1.BytesMessage")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() { proto.RegisterFile("filesync.proto", fileDescriptor_d1042549f1f24495) }
|
||||||
|
|
||||||
|
var fileDescriptor_d1042549f1f24495 = []byte{
|
||||||
|
// 217 bytes of a gzipped FileDescriptorProto
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4b, 0xcb, 0xcc, 0x49,
|
||||||
|
0x2d, 0xae, 0xcc, 0x4b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xc8, 0xcd, 0x4f, 0xaa,
|
||||||
|
0xd4, 0x83, 0x0b, 0x96, 0x19, 0x2a, 0x29, 0x71, 0xf1, 0x38, 0x55, 0x96, 0xa4, 0x16, 0xfb, 0xa6,
|
||||||
|
0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0x09, 0x71, 0xb1, 0xa4, 0x24, 0x96, 0x24, 0x4a, 0x30, 0x2a,
|
||||||
|
0x30, 0x6a, 0xf0, 0x04, 0x81, 0xd9, 0x46, 0xab, 0x19, 0xb9, 0x38, 0xdc, 0x32, 0x73, 0x52, 0x83,
|
||||||
|
0x2b, 0xf3, 0x92, 0x85, 0xfc, 0xb8, 0x38, 0x5c, 0x32, 0xd3, 0xd2, 0x9c, 0xf3, 0x0b, 0x2a, 0x85,
|
||||||
|
0xe4, 0xf4, 0xd0, 0xcd, 0xd3, 0x43, 0x36, 0x4c, 0x8a, 0x80, 0xbc, 0x06, 0xa3, 0x01, 0xa3, 0x90,
|
||||||
|
0x3f, 0x17, 0x67, 0x48, 0x62, 0x51, 0x70, 0x49, 0x51, 0x6a, 0x62, 0x2e, 0x35, 0x0c, 0x34, 0x8a,
|
||||||
|
0x82, 0x3a, 0x36, 0x35, 0x2f, 0x85, 0xda, 0x8e, 0x75, 0xb2, 0xbb, 0xf0, 0x50, 0x8e, 0xe1, 0xc6,
|
||||||
|
0x43, 0x39, 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x1b, 0x1e, 0xc9, 0x31, 0xae, 0x78, 0x24, 0xc7, 0x78,
|
||||||
|
0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xbe, 0x78, 0x24, 0xc7,
|
||||||
|
0xf0, 0xe1, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c,
|
||||||
|
0xc7, 0x10, 0xc5, 0x01, 0x33, 0x33, 0x89, 0x0d, 0x1c, 0x0d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
|
||||||
|
0xff, 0x5e, 0xce, 0x52, 0xb3, 0x98, 0x01, 0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
func (this *BytesMessage) Equal(that interface{}) bool {
|
func (this *BytesMessage) Equal(that interface{}) bool {
|
||||||
if that == nil {
|
if that == nil {
|
||||||
return this == nil
|
return this == nil
|
||||||
|
@ -212,6 +232,17 @@ type FileSyncServer interface {
|
||||||
TarStream(FileSync_TarStreamServer) error
|
TarStream(FileSync_TarStreamServer) error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnimplementedFileSyncServer can be embedded to have forward compatible implementations.
|
||||||
|
type UnimplementedFileSyncServer struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UnimplementedFileSyncServer) DiffCopy(srv FileSync_DiffCopyServer) error {
|
||||||
|
return status.Errorf(codes.Unimplemented, "method DiffCopy not implemented")
|
||||||
|
}
|
||||||
|
func (*UnimplementedFileSyncServer) TarStream(srv FileSync_TarStreamServer) error {
|
||||||
|
return status.Errorf(codes.Unimplemented, "method TarStream not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterFileSyncServer(s *grpc.Server, srv FileSyncServer) {
|
func RegisterFileSyncServer(s *grpc.Server, srv FileSyncServer) {
|
||||||
s.RegisterService(&_FileSync_serviceDesc, srv)
|
s.RegisterService(&_FileSync_serviceDesc, srv)
|
||||||
}
|
}
|
||||||
|
@ -340,6 +371,14 @@ type FileSendServer interface {
|
||||||
DiffCopy(FileSend_DiffCopyServer) error
|
DiffCopy(FileSend_DiffCopyServer) error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnimplementedFileSendServer can be embedded to have forward compatible implementations.
|
||||||
|
type UnimplementedFileSendServer struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UnimplementedFileSendServer) DiffCopy(srv FileSend_DiffCopyServer) error {
|
||||||
|
return status.Errorf(codes.Unimplemented, "method DiffCopy not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterFileSendServer(s *grpc.Server, srv FileSendServer) {
|
func RegisterFileSendServer(s *grpc.Server, srv FileSendServer) {
|
||||||
s.RegisterService(&_FileSend_serviceDesc, srv)
|
s.RegisterService(&_FileSend_serviceDesc, srv)
|
||||||
}
|
}
|
||||||
|
@ -388,7 +427,7 @@ var _FileSend_serviceDesc = grpc.ServiceDesc{
|
||||||
func (m *BytesMessage) Marshal() (dAtA []byte, err error) {
|
func (m *BytesMessage) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -396,27 +435,35 @@ func (m *BytesMessage) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *BytesMessage) MarshalTo(dAtA []byte) (int, error) {
|
func (m *BytesMessage) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *BytesMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.Data) > 0 {
|
if len(m.Data) > 0 {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.Data)
|
||||||
i++
|
copy(dAtA[i:], m.Data)
|
||||||
i = encodeVarintFilesync(dAtA, i, uint64(len(m.Data)))
|
i = encodeVarintFilesync(dAtA, i, uint64(len(m.Data)))
|
||||||
i += copy(dAtA[i:], m.Data)
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
}
|
}
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeVarintFilesync(dAtA []byte, offset int, v uint64) int {
|
func encodeVarintFilesync(dAtA []byte, offset int, v uint64) int {
|
||||||
|
offset -= sovFilesync(v)
|
||||||
|
base := offset
|
||||||
for v >= 1<<7 {
|
for v >= 1<<7 {
|
||||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||||
v >>= 7
|
v >>= 7
|
||||||
offset++
|
offset++
|
||||||
}
|
}
|
||||||
dAtA[offset] = uint8(v)
|
dAtA[offset] = uint8(v)
|
||||||
return offset + 1
|
return base
|
||||||
}
|
}
|
||||||
func (m *BytesMessage) Size() (n int) {
|
func (m *BytesMessage) Size() (n int) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -432,14 +479,7 @@ func (m *BytesMessage) Size() (n int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sovFilesync(x uint64) (n int) {
|
func sovFilesync(x uint64) (n int) {
|
||||||
for {
|
return (math_bits.Len64(x|1) + 6) / 7
|
||||||
n++
|
|
||||||
x >>= 7
|
|
||||||
if x == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n
|
|
||||||
}
|
}
|
||||||
func sozFilesync(x uint64) (n int) {
|
func sozFilesync(x uint64) (n int) {
|
||||||
return sovFilesync(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
return sovFilesync(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
||||||
|
@ -477,7 +517,7 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -505,7 +545,7 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
byteLen |= (int(b) & 0x7F) << shift
|
byteLen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -514,6 +554,9 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthFilesync
|
return ErrInvalidLengthFilesync
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + byteLen
|
postIndex := iNdEx + byteLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthFilesync
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -531,6 +574,9 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthFilesync
|
return ErrInvalidLengthFilesync
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthFilesync
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -546,6 +592,7 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
func skipFilesync(dAtA []byte) (n int, err error) {
|
func skipFilesync(dAtA []byte) (n int, err error) {
|
||||||
l := len(dAtA)
|
l := len(dAtA)
|
||||||
iNdEx := 0
|
iNdEx := 0
|
||||||
|
depth := 0
|
||||||
for iNdEx < l {
|
for iNdEx < l {
|
||||||
var wire uint64
|
var wire uint64
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -577,10 +624,8 @@ func skipFilesync(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
|
||||||
case 1:
|
case 1:
|
||||||
iNdEx += 8
|
iNdEx += 8
|
||||||
return iNdEx, nil
|
|
||||||
case 2:
|
case 2:
|
||||||
var length int
|
var length int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -597,73 +642,34 @@ func skipFilesync(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
iNdEx += length
|
|
||||||
if length < 0 {
|
if length < 0 {
|
||||||
return 0, ErrInvalidLengthFilesync
|
return 0, ErrInvalidLengthFilesync
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
iNdEx += length
|
||||||
case 3:
|
case 3:
|
||||||
for {
|
depth++
|
||||||
var innerWire uint64
|
|
||||||
var start int = iNdEx
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return 0, ErrIntOverflowFilesync
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return 0, io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
innerWire |= (uint64(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
innerWireType := int(innerWire & 0x7)
|
|
||||||
if innerWireType == 4 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
next, err := skipFilesync(dAtA[start:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
iNdEx = start + next
|
|
||||||
}
|
|
||||||
return iNdEx, nil
|
|
||||||
case 4:
|
case 4:
|
||||||
return iNdEx, nil
|
if depth == 0 {
|
||||||
|
return 0, ErrUnexpectedEndOfGroupFilesync
|
||||||
|
}
|
||||||
|
depth--
|
||||||
case 5:
|
case 5:
|
||||||
iNdEx += 4
|
iNdEx += 4
|
||||||
return iNdEx, nil
|
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
||||||
}
|
}
|
||||||
|
if iNdEx < 0 {
|
||||||
|
return 0, ErrInvalidLengthFilesync
|
||||||
}
|
}
|
||||||
panic("unreachable")
|
if depth == 0 {
|
||||||
|
return iNdEx, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrInvalidLengthFilesync = fmt.Errorf("proto: negative length found during unmarshaling")
|
ErrInvalidLengthFilesync = fmt.Errorf("proto: negative length found during unmarshaling")
|
||||||
ErrIntOverflowFilesync = fmt.Errorf("proto: integer overflow")
|
ErrIntOverflowFilesync = fmt.Errorf("proto: integer overflow")
|
||||||
|
ErrUnexpectedEndOfGroupFilesync = fmt.Errorf("proto: unexpected end of group")
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() { proto.RegisterFile("filesync.proto", fileDescriptor_filesync_26f8b7bce2e5ac0e) }
|
|
||||||
|
|
||||||
var fileDescriptor_filesync_26f8b7bce2e5ac0e = []byte{
|
|
||||||
// 217 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4b, 0xcb, 0xcc, 0x49,
|
|
||||||
0x2d, 0xae, 0xcc, 0x4b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xc8, 0xcd, 0x4f, 0xaa,
|
|
||||||
0xd4, 0x83, 0x0b, 0x96, 0x19, 0x2a, 0x29, 0x71, 0xf1, 0x38, 0x55, 0x96, 0xa4, 0x16, 0xfb, 0xa6,
|
|
||||||
0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a, 0x09, 0x71, 0xb1, 0xa4, 0x24, 0x96, 0x24, 0x4a, 0x30, 0x2a,
|
|
||||||
0x30, 0x6a, 0xf0, 0x04, 0x81, 0xd9, 0x46, 0xab, 0x19, 0xb9, 0x38, 0xdc, 0x32, 0x73, 0x52, 0x83,
|
|
||||||
0x2b, 0xf3, 0x92, 0x85, 0xfc, 0xb8, 0x38, 0x5c, 0x32, 0xd3, 0xd2, 0x9c, 0xf3, 0x0b, 0x2a, 0x85,
|
|
||||||
0xe4, 0xf4, 0xd0, 0xcd, 0xd3, 0x43, 0x36, 0x4c, 0x8a, 0x80, 0xbc, 0x06, 0xa3, 0x01, 0xa3, 0x90,
|
|
||||||
0x3f, 0x17, 0x67, 0x48, 0x62, 0x51, 0x70, 0x49, 0x51, 0x6a, 0x62, 0x2e, 0x35, 0x0c, 0x34, 0x8a,
|
|
||||||
0x82, 0x3a, 0x36, 0x35, 0x2f, 0x85, 0xda, 0x8e, 0x75, 0xb2, 0xbb, 0xf0, 0x50, 0x8e, 0xe1, 0xc6,
|
|
||||||
0x43, 0x39, 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x1b, 0x1e, 0xc9, 0x31, 0xae, 0x78, 0x24, 0xc7, 0x78,
|
|
||||||
0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xbe, 0x78, 0x24, 0xc7,
|
|
||||||
0xf0, 0xe1, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c,
|
|
||||||
0xc7, 0x10, 0xc5, 0x01, 0x33, 0x33, 0x89, 0x0d, 0x1c, 0x0d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
|
|
||||||
0xff, 0x5e, 0xce, 0x52, 0xb3, 0x98, 0x01, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
|
|
|
@ -3,23 +3,22 @@
|
||||||
|
|
||||||
package secrets
|
package secrets
|
||||||
|
|
||||||
import proto "github.com/gogo/protobuf/proto"
|
|
||||||
import fmt "fmt"
|
|
||||||
import math "math"
|
|
||||||
|
|
||||||
import bytes "bytes"
|
|
||||||
|
|
||||||
import strings "strings"
|
|
||||||
import reflect "reflect"
|
|
||||||
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
context "golang.org/x/net/context"
|
bytes "bytes"
|
||||||
|
context "context"
|
||||||
|
fmt "fmt"
|
||||||
|
proto "github.com/gogo/protobuf/proto"
|
||||||
|
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
|
||||||
grpc "google.golang.org/grpc"
|
grpc "google.golang.org/grpc"
|
||||||
|
codes "google.golang.org/grpc/codes"
|
||||||
|
status "google.golang.org/grpc/status"
|
||||||
|
io "io"
|
||||||
|
math "math"
|
||||||
|
math_bits "math/bits"
|
||||||
|
reflect "reflect"
|
||||||
|
strings "strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
import io "io"
|
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
var _ = fmt.Errorf
|
var _ = fmt.Errorf
|
||||||
|
@ -29,7 +28,7 @@ var _ = math.Inf
|
||||||
// is compatible with the proto package it is being compiled against.
|
// is compatible with the proto package it is being compiled against.
|
||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
type GetSecretRequest struct {
|
type GetSecretRequest struct {
|
||||||
ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
|
ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
|
||||||
|
@ -39,7 +38,7 @@ type GetSecretRequest struct {
|
||||||
func (m *GetSecretRequest) Reset() { *m = GetSecretRequest{} }
|
func (m *GetSecretRequest) Reset() { *m = GetSecretRequest{} }
|
||||||
func (*GetSecretRequest) ProtoMessage() {}
|
func (*GetSecretRequest) ProtoMessage() {}
|
||||||
func (*GetSecretRequest) Descriptor() ([]byte, []int) {
|
func (*GetSecretRequest) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_secrets_21bd4adec74a381e, []int{0}
|
return fileDescriptor_d4bc6c625e214507, []int{0}
|
||||||
}
|
}
|
||||||
func (m *GetSecretRequest) XXX_Unmarshal(b []byte) error {
|
func (m *GetSecretRequest) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -49,15 +48,15 @@ func (m *GetSecretRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er
|
||||||
return xxx_messageInfo_GetSecretRequest.Marshal(b, m, deterministic)
|
return xxx_messageInfo_GetSecretRequest.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *GetSecretRequest) XXX_Merge(src proto.Message) {
|
func (m *GetSecretRequest) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_GetSecretRequest.Merge(dst, src)
|
xxx_messageInfo_GetSecretRequest.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *GetSecretRequest) XXX_Size() int {
|
func (m *GetSecretRequest) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -89,7 +88,7 @@ type GetSecretResponse struct {
|
||||||
func (m *GetSecretResponse) Reset() { *m = GetSecretResponse{} }
|
func (m *GetSecretResponse) Reset() { *m = GetSecretResponse{} }
|
||||||
func (*GetSecretResponse) ProtoMessage() {}
|
func (*GetSecretResponse) ProtoMessage() {}
|
||||||
func (*GetSecretResponse) Descriptor() ([]byte, []int) {
|
func (*GetSecretResponse) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_secrets_21bd4adec74a381e, []int{1}
|
return fileDescriptor_d4bc6c625e214507, []int{1}
|
||||||
}
|
}
|
||||||
func (m *GetSecretResponse) XXX_Unmarshal(b []byte) error {
|
func (m *GetSecretResponse) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -99,15 +98,15 @@ func (m *GetSecretResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e
|
||||||
return xxx_messageInfo_GetSecretResponse.Marshal(b, m, deterministic)
|
return xxx_messageInfo_GetSecretResponse.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *GetSecretResponse) XXX_Merge(src proto.Message) {
|
func (m *GetSecretResponse) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_GetSecretResponse.Merge(dst, src)
|
xxx_messageInfo_GetSecretResponse.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *GetSecretResponse) XXX_Size() int {
|
func (m *GetSecretResponse) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -130,6 +129,31 @@ func init() {
|
||||||
proto.RegisterMapType((map[string]string)(nil), "moby.buildkit.secrets.v1.GetSecretRequest.AnnotationsEntry")
|
proto.RegisterMapType((map[string]string)(nil), "moby.buildkit.secrets.v1.GetSecretRequest.AnnotationsEntry")
|
||||||
proto.RegisterType((*GetSecretResponse)(nil), "moby.buildkit.secrets.v1.GetSecretResponse")
|
proto.RegisterType((*GetSecretResponse)(nil), "moby.buildkit.secrets.v1.GetSecretResponse")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() { proto.RegisterFile("secrets.proto", fileDescriptor_d4bc6c625e214507) }
|
||||||
|
|
||||||
|
var fileDescriptor_d4bc6c625e214507 = []byte{
|
||||||
|
// 288 bytes of a gzipped FileDescriptorProto
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2d, 0x4e, 0x4d, 0x2e,
|
||||||
|
0x4a, 0x2d, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc8, 0xcd, 0x4f, 0xaa, 0xd4,
|
||||||
|
0x4b, 0x2a, 0xcd, 0xcc, 0x49, 0xc9, 0xce, 0x2c, 0xd1, 0x83, 0x49, 0x96, 0x19, 0x2a, 0x1d, 0x64,
|
||||||
|
0xe4, 0x12, 0x70, 0x4f, 0x2d, 0x09, 0x06, 0x8b, 0x04, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x08,
|
||||||
|
0xf1, 0x71, 0x31, 0x79, 0xba, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x31, 0x79, 0xba, 0x08,
|
||||||
|
0xc5, 0x72, 0x71, 0x27, 0xe6, 0xe5, 0xe5, 0x97, 0x24, 0x96, 0x64, 0xe6, 0xe7, 0x15, 0x4b, 0x30,
|
||||||
|
0x29, 0x30, 0x6b, 0x70, 0x1b, 0x59, 0xeb, 0xe1, 0x32, 0x54, 0x0f, 0xdd, 0x40, 0x3d, 0x47, 0x84,
|
||||||
|
0x6e, 0xd7, 0xbc, 0x92, 0xa2, 0xca, 0x20, 0x64, 0xf3, 0xa4, 0xec, 0xb8, 0x04, 0xd0, 0x15, 0x08,
|
||||||
|
0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x42, 0xdd, 0x00, 0x62, 0x0a, 0x89, 0x70, 0xb1, 0x96, 0x25,
|
||||||
|
0xe6, 0x94, 0xa6, 0x4a, 0x30, 0x81, 0xc5, 0x20, 0x1c, 0x2b, 0x26, 0x0b, 0x46, 0x25, 0x75, 0x2e,
|
||||||
|
0x41, 0x24, 0x1b, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x84, 0xb8, 0x58, 0x52, 0x12, 0x4b,
|
||||||
|
0x12, 0xc1, 0x26, 0xf0, 0x04, 0x81, 0xd9, 0x46, 0xf9, 0x5c, 0xec, 0x10, 0x55, 0xc5, 0x42, 0x29,
|
||||||
|
0x5c, 0x9c, 0x70, 0x3d, 0x42, 0x5a, 0xc4, 0x7b, 0x45, 0x4a, 0x9b, 0x28, 0xb5, 0x10, 0x47, 0x38,
|
||||||
|
0xd9, 0x5e, 0x78, 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f,
|
||||||
|
0xe4, 0x18, 0x57, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07,
|
||||||
|
0x8f, 0xe4, 0x18, 0x5f, 0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86,
|
||||||
|
0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x62, 0x87, 0x9a, 0x99, 0xc4, 0x06, 0x8e,
|
||||||
|
0x3d, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x38, 0xec, 0x1f, 0xce, 0x01, 0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
func (this *GetSecretRequest) Equal(that interface{}) bool {
|
func (this *GetSecretRequest) Equal(that interface{}) bool {
|
||||||
if that == nil {
|
if that == nil {
|
||||||
return this == nil
|
return this == nil
|
||||||
|
@ -265,6 +289,14 @@ type SecretsServer interface {
|
||||||
GetSecret(context.Context, *GetSecretRequest) (*GetSecretResponse, error)
|
GetSecret(context.Context, *GetSecretRequest) (*GetSecretResponse, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnimplementedSecretsServer can be embedded to have forward compatible implementations.
|
||||||
|
type UnimplementedSecretsServer struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UnimplementedSecretsServer) GetSecret(ctx context.Context, req *GetSecretRequest) (*GetSecretResponse, error) {
|
||||||
|
return nil, status.Errorf(codes.Unimplemented, "method GetSecret not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterSecretsServer(s *grpc.Server, srv SecretsServer) {
|
func RegisterSecretsServer(s *grpc.Server, srv SecretsServer) {
|
||||||
s.RegisterService(&_Secrets_serviceDesc, srv)
|
s.RegisterService(&_Secrets_serviceDesc, srv)
|
||||||
}
|
}
|
||||||
|
@ -303,7 +335,7 @@ var _Secrets_serviceDesc = grpc.ServiceDesc{
|
||||||
func (m *GetSecretRequest) Marshal() (dAtA []byte, err error) {
|
func (m *GetSecretRequest) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -311,40 +343,48 @@ func (m *GetSecretRequest) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *GetSecretRequest) MarshalTo(dAtA []byte) (int, error) {
|
func (m *GetSecretRequest) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *GetSecretRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.ID) > 0 {
|
|
||||||
dAtA[i] = 0xa
|
|
||||||
i++
|
|
||||||
i = encodeVarintSecrets(dAtA, i, uint64(len(m.ID)))
|
|
||||||
i += copy(dAtA[i:], m.ID)
|
|
||||||
}
|
|
||||||
if len(m.Annotations) > 0 {
|
if len(m.Annotations) > 0 {
|
||||||
for k, _ := range m.Annotations {
|
for k := range m.Annotations {
|
||||||
dAtA[i] = 0x12
|
|
||||||
i++
|
|
||||||
v := m.Annotations[k]
|
v := m.Annotations[k]
|
||||||
mapSize := 1 + len(k) + sovSecrets(uint64(len(k))) + 1 + len(v) + sovSecrets(uint64(len(v)))
|
baseI := i
|
||||||
i = encodeVarintSecrets(dAtA, i, uint64(mapSize))
|
i -= len(v)
|
||||||
dAtA[i] = 0xa
|
copy(dAtA[i:], v)
|
||||||
i++
|
|
||||||
i = encodeVarintSecrets(dAtA, i, uint64(len(k)))
|
|
||||||
i += copy(dAtA[i:], k)
|
|
||||||
dAtA[i] = 0x12
|
|
||||||
i++
|
|
||||||
i = encodeVarintSecrets(dAtA, i, uint64(len(v)))
|
i = encodeVarintSecrets(dAtA, i, uint64(len(v)))
|
||||||
i += copy(dAtA[i:], v)
|
i--
|
||||||
|
dAtA[i] = 0x12
|
||||||
|
i -= len(k)
|
||||||
|
copy(dAtA[i:], k)
|
||||||
|
i = encodeVarintSecrets(dAtA, i, uint64(len(k)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
|
i = encodeVarintSecrets(dAtA, i, uint64(baseI-i))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x12
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return i, nil
|
if len(m.ID) > 0 {
|
||||||
|
i -= len(m.ID)
|
||||||
|
copy(dAtA[i:], m.ID)
|
||||||
|
i = encodeVarintSecrets(dAtA, i, uint64(len(m.ID)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
|
}
|
||||||
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *GetSecretResponse) Marshal() (dAtA []byte, err error) {
|
func (m *GetSecretResponse) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -352,27 +392,35 @@ func (m *GetSecretResponse) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *GetSecretResponse) MarshalTo(dAtA []byte) (int, error) {
|
func (m *GetSecretResponse) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *GetSecretResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.Data) > 0 {
|
if len(m.Data) > 0 {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.Data)
|
||||||
i++
|
copy(dAtA[i:], m.Data)
|
||||||
i = encodeVarintSecrets(dAtA, i, uint64(len(m.Data)))
|
i = encodeVarintSecrets(dAtA, i, uint64(len(m.Data)))
|
||||||
i += copy(dAtA[i:], m.Data)
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
}
|
}
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeVarintSecrets(dAtA []byte, offset int, v uint64) int {
|
func encodeVarintSecrets(dAtA []byte, offset int, v uint64) int {
|
||||||
|
offset -= sovSecrets(v)
|
||||||
|
base := offset
|
||||||
for v >= 1<<7 {
|
for v >= 1<<7 {
|
||||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||||
v >>= 7
|
v >>= 7
|
||||||
offset++
|
offset++
|
||||||
}
|
}
|
||||||
dAtA[offset] = uint8(v)
|
dAtA[offset] = uint8(v)
|
||||||
return offset + 1
|
return base
|
||||||
}
|
}
|
||||||
func (m *GetSecretRequest) Size() (n int) {
|
func (m *GetSecretRequest) Size() (n int) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -409,14 +457,7 @@ func (m *GetSecretResponse) Size() (n int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sovSecrets(x uint64) (n int) {
|
func sovSecrets(x uint64) (n int) {
|
||||||
for {
|
return (math_bits.Len64(x|1) + 6) / 7
|
||||||
n++
|
|
||||||
x >>= 7
|
|
||||||
if x == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n
|
|
||||||
}
|
}
|
||||||
func sozSecrets(x uint64) (n int) {
|
func sozSecrets(x uint64) (n int) {
|
||||||
return sovSecrets(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
return sovSecrets(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
||||||
|
@ -475,7 +516,7 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -503,7 +544,7 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -513,6 +554,9 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -532,7 +576,7 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
msglen |= (int(b) & 0x7F) << shift
|
msglen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -541,6 +585,9 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + msglen
|
postIndex := iNdEx + msglen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -561,7 +608,7 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -578,7 +625,7 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLenmapkey |= (uint64(b) & 0x7F) << shift
|
stringLenmapkey |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -588,6 +635,9 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
postStringIndexmapkey := iNdEx + intStringLenmapkey
|
postStringIndexmapkey := iNdEx + intStringLenmapkey
|
||||||
|
if postStringIndexmapkey < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if postStringIndexmapkey > l {
|
if postStringIndexmapkey > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -604,7 +654,7 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLenmapvalue |= (uint64(b) & 0x7F) << shift
|
stringLenmapvalue |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -614,6 +664,9 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
postStringIndexmapvalue := iNdEx + intStringLenmapvalue
|
postStringIndexmapvalue := iNdEx + intStringLenmapvalue
|
||||||
|
if postStringIndexmapvalue < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if postStringIndexmapvalue > l {
|
if postStringIndexmapvalue > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -645,6 +698,9 @@ func (m *GetSecretRequest) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -672,7 +728,7 @@ func (m *GetSecretResponse) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -700,7 +756,7 @@ func (m *GetSecretResponse) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
byteLen |= (int(b) & 0x7F) << shift
|
byteLen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -709,6 +765,9 @@ func (m *GetSecretResponse) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + byteLen
|
postIndex := iNdEx + byteLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -726,6 +785,9 @@ func (m *GetSecretResponse) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthSecrets
|
return ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthSecrets
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -741,6 +803,7 @@ func (m *GetSecretResponse) Unmarshal(dAtA []byte) error {
|
||||||
func skipSecrets(dAtA []byte) (n int, err error) {
|
func skipSecrets(dAtA []byte) (n int, err error) {
|
||||||
l := len(dAtA)
|
l := len(dAtA)
|
||||||
iNdEx := 0
|
iNdEx := 0
|
||||||
|
depth := 0
|
||||||
for iNdEx < l {
|
for iNdEx < l {
|
||||||
var wire uint64
|
var wire uint64
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -772,10 +835,8 @@ func skipSecrets(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
|
||||||
case 1:
|
case 1:
|
||||||
iNdEx += 8
|
iNdEx += 8
|
||||||
return iNdEx, nil
|
|
||||||
case 2:
|
case 2:
|
||||||
var length int
|
var length int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -792,77 +853,34 @@ func skipSecrets(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
iNdEx += length
|
|
||||||
if length < 0 {
|
if length < 0 {
|
||||||
return 0, ErrInvalidLengthSecrets
|
return 0, ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
iNdEx += length
|
||||||
case 3:
|
case 3:
|
||||||
for {
|
depth++
|
||||||
var innerWire uint64
|
|
||||||
var start int = iNdEx
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return 0, ErrIntOverflowSecrets
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return 0, io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
innerWire |= (uint64(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
innerWireType := int(innerWire & 0x7)
|
|
||||||
if innerWireType == 4 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
next, err := skipSecrets(dAtA[start:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
iNdEx = start + next
|
|
||||||
}
|
|
||||||
return iNdEx, nil
|
|
||||||
case 4:
|
case 4:
|
||||||
return iNdEx, nil
|
if depth == 0 {
|
||||||
|
return 0, ErrUnexpectedEndOfGroupSecrets
|
||||||
|
}
|
||||||
|
depth--
|
||||||
case 5:
|
case 5:
|
||||||
iNdEx += 4
|
iNdEx += 4
|
||||||
return iNdEx, nil
|
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
||||||
}
|
}
|
||||||
|
if iNdEx < 0 {
|
||||||
|
return 0, ErrInvalidLengthSecrets
|
||||||
}
|
}
|
||||||
panic("unreachable")
|
if depth == 0 {
|
||||||
|
return iNdEx, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrInvalidLengthSecrets = fmt.Errorf("proto: negative length found during unmarshaling")
|
ErrInvalidLengthSecrets = fmt.Errorf("proto: negative length found during unmarshaling")
|
||||||
ErrIntOverflowSecrets = fmt.Errorf("proto: integer overflow")
|
ErrIntOverflowSecrets = fmt.Errorf("proto: integer overflow")
|
||||||
|
ErrUnexpectedEndOfGroupSecrets = fmt.Errorf("proto: unexpected end of group")
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() { proto.RegisterFile("secrets.proto", fileDescriptor_secrets_21bd4adec74a381e) }
|
|
||||||
|
|
||||||
var fileDescriptor_secrets_21bd4adec74a381e = []byte{
|
|
||||||
// 288 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2d, 0x4e, 0x4d, 0x2e,
|
|
||||||
0x4a, 0x2d, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc8, 0xcd, 0x4f, 0xaa, 0xd4,
|
|
||||||
0x4b, 0x2a, 0xcd, 0xcc, 0x49, 0xc9, 0xce, 0x2c, 0xd1, 0x83, 0x49, 0x96, 0x19, 0x2a, 0x1d, 0x64,
|
|
||||||
0xe4, 0x12, 0x70, 0x4f, 0x2d, 0x09, 0x06, 0x8b, 0x04, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x08,
|
|
||||||
0xf1, 0x71, 0x31, 0x79, 0xba, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x31, 0x79, 0xba, 0x08,
|
|
||||||
0xc5, 0x72, 0x71, 0x27, 0xe6, 0xe5, 0xe5, 0x97, 0x24, 0x96, 0x64, 0xe6, 0xe7, 0x15, 0x4b, 0x30,
|
|
||||||
0x29, 0x30, 0x6b, 0x70, 0x1b, 0x59, 0xeb, 0xe1, 0x32, 0x54, 0x0f, 0xdd, 0x40, 0x3d, 0x47, 0x84,
|
|
||||||
0x6e, 0xd7, 0xbc, 0x92, 0xa2, 0xca, 0x20, 0x64, 0xf3, 0xa4, 0xec, 0xb8, 0x04, 0xd0, 0x15, 0x08,
|
|
||||||
0x09, 0x70, 0x31, 0x67, 0xa7, 0x56, 0x42, 0xdd, 0x00, 0x62, 0x0a, 0x89, 0x70, 0xb1, 0x96, 0x25,
|
|
||||||
0xe6, 0x94, 0xa6, 0x4a, 0x30, 0x81, 0xc5, 0x20, 0x1c, 0x2b, 0x26, 0x0b, 0x46, 0x25, 0x75, 0x2e,
|
|
||||||
0x41, 0x24, 0x1b, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x84, 0xb8, 0x58, 0x52, 0x12, 0x4b,
|
|
||||||
0x12, 0xc1, 0x26, 0xf0, 0x04, 0x81, 0xd9, 0x46, 0xf9, 0x5c, 0xec, 0x10, 0x55, 0xc5, 0x42, 0x29,
|
|
||||||
0x5c, 0x9c, 0x70, 0x3d, 0x42, 0x5a, 0xc4, 0x7b, 0x45, 0x4a, 0x9b, 0x28, 0xb5, 0x10, 0x47, 0x38,
|
|
||||||
0xd9, 0x5e, 0x78, 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f,
|
|
||||||
0xe4, 0x18, 0x57, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07,
|
|
||||||
0x8f, 0xe4, 0x18, 0x5f, 0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86,
|
|
||||||
0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x62, 0x87, 0x9a, 0x99, 0xc4, 0x06, 0x8e,
|
|
||||||
0x3d, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x38, 0xec, 0x1f, 0xce, 0x01, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
|
|
|
@ -75,6 +75,10 @@ func MountSSHSocket(ctx context.Context, c session.Caller, opt SocketOpt) (sockP
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
if err := os.Chmod(dir, 0711); err != nil {
|
||||||
|
return "", nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
sockPath = filepath.Join(dir, "ssh_auth_sock")
|
sockPath = filepath.Join(dir, "ssh_auth_sock")
|
||||||
|
|
||||||
l, err := net.Listen("unix", sockPath)
|
l, err := net.Listen("unix", sockPath)
|
||||||
|
|
|
@ -3,22 +3,21 @@
|
||||||
|
|
||||||
package sshforward
|
package sshforward
|
||||||
|
|
||||||
import proto "github.com/gogo/protobuf/proto"
|
|
||||||
import fmt "fmt"
|
|
||||||
import math "math"
|
|
||||||
|
|
||||||
import bytes "bytes"
|
|
||||||
|
|
||||||
import strings "strings"
|
|
||||||
import reflect "reflect"
|
|
||||||
|
|
||||||
import (
|
import (
|
||||||
context "golang.org/x/net/context"
|
bytes "bytes"
|
||||||
|
context "context"
|
||||||
|
fmt "fmt"
|
||||||
|
proto "github.com/gogo/protobuf/proto"
|
||||||
grpc "google.golang.org/grpc"
|
grpc "google.golang.org/grpc"
|
||||||
|
codes "google.golang.org/grpc/codes"
|
||||||
|
status "google.golang.org/grpc/status"
|
||||||
|
io "io"
|
||||||
|
math "math"
|
||||||
|
math_bits "math/bits"
|
||||||
|
reflect "reflect"
|
||||||
|
strings "strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
import io "io"
|
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
var _ = fmt.Errorf
|
var _ = fmt.Errorf
|
||||||
|
@ -28,7 +27,7 @@ var _ = math.Inf
|
||||||
// is compatible with the proto package it is being compiled against.
|
// is compatible with the proto package it is being compiled against.
|
||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
// BytesMessage contains a chunk of byte data
|
// BytesMessage contains a chunk of byte data
|
||||||
type BytesMessage struct {
|
type BytesMessage struct {
|
||||||
|
@ -38,7 +37,7 @@ type BytesMessage struct {
|
||||||
func (m *BytesMessage) Reset() { *m = BytesMessage{} }
|
func (m *BytesMessage) Reset() { *m = BytesMessage{} }
|
||||||
func (*BytesMessage) ProtoMessage() {}
|
func (*BytesMessage) ProtoMessage() {}
|
||||||
func (*BytesMessage) Descriptor() ([]byte, []int) {
|
func (*BytesMessage) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_ssh_13bd2c34c031d472, []int{0}
|
return fileDescriptor_ef0eae71e2e883eb, []int{0}
|
||||||
}
|
}
|
||||||
func (m *BytesMessage) XXX_Unmarshal(b []byte) error {
|
func (m *BytesMessage) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -48,15 +47,15 @@ func (m *BytesMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
|
||||||
return xxx_messageInfo_BytesMessage.Marshal(b, m, deterministic)
|
return xxx_messageInfo_BytesMessage.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *BytesMessage) XXX_Merge(src proto.Message) {
|
func (m *BytesMessage) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_BytesMessage.Merge(dst, src)
|
xxx_messageInfo_BytesMessage.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *BytesMessage) XXX_Size() int {
|
func (m *BytesMessage) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -81,7 +80,7 @@ type CheckAgentRequest struct {
|
||||||
func (m *CheckAgentRequest) Reset() { *m = CheckAgentRequest{} }
|
func (m *CheckAgentRequest) Reset() { *m = CheckAgentRequest{} }
|
||||||
func (*CheckAgentRequest) ProtoMessage() {}
|
func (*CheckAgentRequest) ProtoMessage() {}
|
||||||
func (*CheckAgentRequest) Descriptor() ([]byte, []int) {
|
func (*CheckAgentRequest) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_ssh_13bd2c34c031d472, []int{1}
|
return fileDescriptor_ef0eae71e2e883eb, []int{1}
|
||||||
}
|
}
|
||||||
func (m *CheckAgentRequest) XXX_Unmarshal(b []byte) error {
|
func (m *CheckAgentRequest) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -91,15 +90,15 @@ func (m *CheckAgentRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, e
|
||||||
return xxx_messageInfo_CheckAgentRequest.Marshal(b, m, deterministic)
|
return xxx_messageInfo_CheckAgentRequest.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *CheckAgentRequest) XXX_Merge(src proto.Message) {
|
func (m *CheckAgentRequest) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_CheckAgentRequest.Merge(dst, src)
|
xxx_messageInfo_CheckAgentRequest.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *CheckAgentRequest) XXX_Size() int {
|
func (m *CheckAgentRequest) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -123,7 +122,7 @@ type CheckAgentResponse struct {
|
||||||
func (m *CheckAgentResponse) Reset() { *m = CheckAgentResponse{} }
|
func (m *CheckAgentResponse) Reset() { *m = CheckAgentResponse{} }
|
||||||
func (*CheckAgentResponse) ProtoMessage() {}
|
func (*CheckAgentResponse) ProtoMessage() {}
|
||||||
func (*CheckAgentResponse) Descriptor() ([]byte, []int) {
|
func (*CheckAgentResponse) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_ssh_13bd2c34c031d472, []int{2}
|
return fileDescriptor_ef0eae71e2e883eb, []int{2}
|
||||||
}
|
}
|
||||||
func (m *CheckAgentResponse) XXX_Unmarshal(b []byte) error {
|
func (m *CheckAgentResponse) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -133,15 +132,15 @@ func (m *CheckAgentResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte,
|
||||||
return xxx_messageInfo_CheckAgentResponse.Marshal(b, m, deterministic)
|
return xxx_messageInfo_CheckAgentResponse.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *CheckAgentResponse) XXX_Merge(src proto.Message) {
|
func (m *CheckAgentResponse) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_CheckAgentResponse.Merge(dst, src)
|
xxx_messageInfo_CheckAgentResponse.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *CheckAgentResponse) XXX_Size() int {
|
func (m *CheckAgentResponse) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -157,6 +156,29 @@ func init() {
|
||||||
proto.RegisterType((*CheckAgentRequest)(nil), "moby.sshforward.v1.CheckAgentRequest")
|
proto.RegisterType((*CheckAgentRequest)(nil), "moby.sshforward.v1.CheckAgentRequest")
|
||||||
proto.RegisterType((*CheckAgentResponse)(nil), "moby.sshforward.v1.CheckAgentResponse")
|
proto.RegisterType((*CheckAgentResponse)(nil), "moby.sshforward.v1.CheckAgentResponse")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() { proto.RegisterFile("ssh.proto", fileDescriptor_ef0eae71e2e883eb) }
|
||||||
|
|
||||||
|
var fileDescriptor_ef0eae71e2e883eb = []byte{
|
||||||
|
// 252 bytes of a gzipped FileDescriptorProto
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2c, 0x2e, 0xce, 0xd0,
|
||||||
|
0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xca, 0xcd, 0x4f, 0xaa, 0xd4, 0x2b, 0x2e, 0xce, 0x48,
|
||||||
|
0xcb, 0x2f, 0x2a, 0x4f, 0x2c, 0x4a, 0xd1, 0x2b, 0x33, 0x54, 0x52, 0xe2, 0xe2, 0x71, 0xaa, 0x2c,
|
||||||
|
0x49, 0x2d, 0xf6, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x15, 0x12, 0xe2, 0x62, 0x49, 0x49, 0x2c,
|
||||||
|
0x49, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x02, 0xb3, 0x95, 0x94, 0xb9, 0x04, 0x9d, 0x33,
|
||||||
|
0x52, 0x93, 0xb3, 0x1d, 0xd3, 0x53, 0xf3, 0x4a, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84,
|
||||||
|
0xf8, 0xb8, 0x98, 0x3c, 0x5d, 0xc0, 0xca, 0x38, 0x83, 0x98, 0x3c, 0x5d, 0x94, 0x44, 0xb8, 0x84,
|
||||||
|
0x90, 0x15, 0x15, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x1a, 0xed, 0x62, 0xe4, 0x62, 0x0e, 0x0e, 0xf6,
|
||||||
|
0x10, 0x8a, 0xe6, 0xe2, 0x42, 0xc8, 0x0a, 0xa9, 0xea, 0x61, 0xba, 0x44, 0x0f, 0xc3, 0x0a, 0x29,
|
||||||
|
0x35, 0x42, 0xca, 0x20, 0x96, 0x08, 0x85, 0x71, 0xf1, 0xb8, 0x41, 0x14, 0x40, 0x8c, 0x57, 0xc0,
|
||||||
|
0xa6, 0x0f, 0xd9, 0x97, 0x52, 0x04, 0x55, 0x68, 0x30, 0x1a, 0x30, 0x3a, 0x39, 0x5c, 0x78, 0x28,
|
||||||
|
0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x57, 0x3c,
|
||||||
|
0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x5f,
|
||||||
|
0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18,
|
||||||
|
0x6e, 0x3c, 0x96, 0x63, 0x88, 0xe2, 0x42, 0x98, 0x9a, 0xc4, 0x06, 0x0e, 0x78, 0x63, 0x40, 0x00,
|
||||||
|
0x00, 0x00, 0xff, 0xff, 0x6c, 0xe6, 0x6d, 0xb7, 0x85, 0x01, 0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
func (this *BytesMessage) Equal(that interface{}) bool {
|
func (this *BytesMessage) Equal(that interface{}) bool {
|
||||||
if that == nil {
|
if that == nil {
|
||||||
return this == nil
|
return this == nil
|
||||||
|
@ -334,6 +356,17 @@ type SSHServer interface {
|
||||||
ForwardAgent(SSH_ForwardAgentServer) error
|
ForwardAgent(SSH_ForwardAgentServer) error
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnimplementedSSHServer can be embedded to have forward compatible implementations.
|
||||||
|
type UnimplementedSSHServer struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UnimplementedSSHServer) CheckAgent(ctx context.Context, req *CheckAgentRequest) (*CheckAgentResponse, error) {
|
||||||
|
return nil, status.Errorf(codes.Unimplemented, "method CheckAgent not implemented")
|
||||||
|
}
|
||||||
|
func (*UnimplementedSSHServer) ForwardAgent(srv SSH_ForwardAgentServer) error {
|
||||||
|
return status.Errorf(codes.Unimplemented, "method ForwardAgent not implemented")
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterSSHServer(s *grpc.Server, srv SSHServer) {
|
func RegisterSSHServer(s *grpc.Server, srv SSHServer) {
|
||||||
s.RegisterService(&_SSH_serviceDesc, srv)
|
s.RegisterService(&_SSH_serviceDesc, srv)
|
||||||
}
|
}
|
||||||
|
@ -405,7 +438,7 @@ var _SSH_serviceDesc = grpc.ServiceDesc{
|
||||||
func (m *BytesMessage) Marshal() (dAtA []byte, err error) {
|
func (m *BytesMessage) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -413,23 +446,29 @@ func (m *BytesMessage) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *BytesMessage) MarshalTo(dAtA []byte) (int, error) {
|
func (m *BytesMessage) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *BytesMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.Data) > 0 {
|
if len(m.Data) > 0 {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.Data)
|
||||||
i++
|
copy(dAtA[i:], m.Data)
|
||||||
i = encodeVarintSsh(dAtA, i, uint64(len(m.Data)))
|
i = encodeVarintSsh(dAtA, i, uint64(len(m.Data)))
|
||||||
i += copy(dAtA[i:], m.Data)
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
}
|
}
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CheckAgentRequest) Marshal() (dAtA []byte, err error) {
|
func (m *CheckAgentRequest) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -437,23 +476,29 @@ func (m *CheckAgentRequest) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CheckAgentRequest) MarshalTo(dAtA []byte) (int, error) {
|
func (m *CheckAgentRequest) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *CheckAgentRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.ID) > 0 {
|
if len(m.ID) > 0 {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.ID)
|
||||||
i++
|
copy(dAtA[i:], m.ID)
|
||||||
i = encodeVarintSsh(dAtA, i, uint64(len(m.ID)))
|
i = encodeVarintSsh(dAtA, i, uint64(len(m.ID)))
|
||||||
i += copy(dAtA[i:], m.ID)
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
}
|
}
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CheckAgentResponse) Marshal() (dAtA []byte, err error) {
|
func (m *CheckAgentResponse) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -461,21 +506,28 @@ func (m *CheckAgentResponse) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *CheckAgentResponse) MarshalTo(dAtA []byte) (int, error) {
|
func (m *CheckAgentResponse) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *CheckAgentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
return i, nil
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeVarintSsh(dAtA []byte, offset int, v uint64) int {
|
func encodeVarintSsh(dAtA []byte, offset int, v uint64) int {
|
||||||
|
offset -= sovSsh(v)
|
||||||
|
base := offset
|
||||||
for v >= 1<<7 {
|
for v >= 1<<7 {
|
||||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||||
v >>= 7
|
v >>= 7
|
||||||
offset++
|
offset++
|
||||||
}
|
}
|
||||||
dAtA[offset] = uint8(v)
|
dAtA[offset] = uint8(v)
|
||||||
return offset + 1
|
return base
|
||||||
}
|
}
|
||||||
func (m *BytesMessage) Size() (n int) {
|
func (m *BytesMessage) Size() (n int) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -513,14 +565,7 @@ func (m *CheckAgentResponse) Size() (n int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sovSsh(x uint64) (n int) {
|
func sovSsh(x uint64) (n int) {
|
||||||
for {
|
return (math_bits.Len64(x|1) + 6) / 7
|
||||||
n++
|
|
||||||
x >>= 7
|
|
||||||
if x == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n
|
|
||||||
}
|
}
|
||||||
func sozSsh(x uint64) (n int) {
|
func sozSsh(x uint64) (n int) {
|
||||||
return sovSsh(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
return sovSsh(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
||||||
|
@ -577,7 +622,7 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -605,7 +650,7 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
byteLen |= (int(b) & 0x7F) << shift
|
byteLen |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -614,6 +659,9 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSsh
|
return ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + byteLen
|
postIndex := iNdEx + byteLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthSsh
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -631,6 +679,9 @@ func (m *BytesMessage) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthSsh
|
return ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthSsh
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -658,7 +709,7 @@ func (m *CheckAgentRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -686,7 +737,7 @@ func (m *CheckAgentRequest) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -696,6 +747,9 @@ func (m *CheckAgentRequest) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthSsh
|
return ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthSsh
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -710,6 +764,9 @@ func (m *CheckAgentRequest) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthSsh
|
return ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthSsh
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -737,7 +794,7 @@ func (m *CheckAgentResponse) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -760,6 +817,9 @@ func (m *CheckAgentResponse) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthSsh
|
return ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthSsh
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -775,6 +835,7 @@ func (m *CheckAgentResponse) Unmarshal(dAtA []byte) error {
|
||||||
func skipSsh(dAtA []byte) (n int, err error) {
|
func skipSsh(dAtA []byte) (n int, err error) {
|
||||||
l := len(dAtA)
|
l := len(dAtA)
|
||||||
iNdEx := 0
|
iNdEx := 0
|
||||||
|
depth := 0
|
||||||
for iNdEx < l {
|
for iNdEx < l {
|
||||||
var wire uint64
|
var wire uint64
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -806,10 +867,8 @@ func skipSsh(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
|
||||||
case 1:
|
case 1:
|
||||||
iNdEx += 8
|
iNdEx += 8
|
||||||
return iNdEx, nil
|
|
||||||
case 2:
|
case 2:
|
||||||
var length int
|
var length int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -826,75 +885,34 @@ func skipSsh(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
iNdEx += length
|
|
||||||
if length < 0 {
|
if length < 0 {
|
||||||
return 0, ErrInvalidLengthSsh
|
return 0, ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
iNdEx += length
|
||||||
case 3:
|
case 3:
|
||||||
for {
|
depth++
|
||||||
var innerWire uint64
|
|
||||||
var start int = iNdEx
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return 0, ErrIntOverflowSsh
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return 0, io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
innerWire |= (uint64(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
innerWireType := int(innerWire & 0x7)
|
|
||||||
if innerWireType == 4 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
next, err := skipSsh(dAtA[start:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
iNdEx = start + next
|
|
||||||
}
|
|
||||||
return iNdEx, nil
|
|
||||||
case 4:
|
case 4:
|
||||||
return iNdEx, nil
|
if depth == 0 {
|
||||||
|
return 0, ErrUnexpectedEndOfGroupSsh
|
||||||
|
}
|
||||||
|
depth--
|
||||||
case 5:
|
case 5:
|
||||||
iNdEx += 4
|
iNdEx += 4
|
||||||
return iNdEx, nil
|
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
||||||
}
|
}
|
||||||
|
if iNdEx < 0 {
|
||||||
|
return 0, ErrInvalidLengthSsh
|
||||||
}
|
}
|
||||||
panic("unreachable")
|
if depth == 0 {
|
||||||
|
return iNdEx, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrInvalidLengthSsh = fmt.Errorf("proto: negative length found during unmarshaling")
|
ErrInvalidLengthSsh = fmt.Errorf("proto: negative length found during unmarshaling")
|
||||||
ErrIntOverflowSsh = fmt.Errorf("proto: integer overflow")
|
ErrIntOverflowSsh = fmt.Errorf("proto: integer overflow")
|
||||||
|
ErrUnexpectedEndOfGroupSsh = fmt.Errorf("proto: unexpected end of group")
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() { proto.RegisterFile("ssh.proto", fileDescriptor_ssh_13bd2c34c031d472) }
|
|
||||||
|
|
||||||
var fileDescriptor_ssh_13bd2c34c031d472 = []byte{
|
|
||||||
// 252 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2c, 0x2e, 0xce, 0xd0,
|
|
||||||
0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xca, 0xcd, 0x4f, 0xaa, 0xd4, 0x2b, 0x2e, 0xce, 0x48,
|
|
||||||
0xcb, 0x2f, 0x2a, 0x4f, 0x2c, 0x4a, 0xd1, 0x2b, 0x33, 0x54, 0x52, 0xe2, 0xe2, 0x71, 0xaa, 0x2c,
|
|
||||||
0x49, 0x2d, 0xf6, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x15, 0x12, 0xe2, 0x62, 0x49, 0x49, 0x2c,
|
|
||||||
0x49, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x02, 0xb3, 0x95, 0x94, 0xb9, 0x04, 0x9d, 0x33,
|
|
||||||
0x52, 0x93, 0xb3, 0x1d, 0xd3, 0x53, 0xf3, 0x4a, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84,
|
|
||||||
0xf8, 0xb8, 0x98, 0x3c, 0x5d, 0xc0, 0xca, 0x38, 0x83, 0x98, 0x3c, 0x5d, 0x94, 0x44, 0xb8, 0x84,
|
|
||||||
0x90, 0x15, 0x15, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x1a, 0xed, 0x62, 0xe4, 0x62, 0x0e, 0x0e, 0xf6,
|
|
||||||
0x10, 0x8a, 0xe6, 0xe2, 0x42, 0xc8, 0x0a, 0xa9, 0xea, 0x61, 0xba, 0x44, 0x0f, 0xc3, 0x0a, 0x29,
|
|
||||||
0x35, 0x42, 0xca, 0x20, 0x96, 0x08, 0x85, 0x71, 0xf1, 0xb8, 0x41, 0x14, 0x40, 0x8c, 0x57, 0xc0,
|
|
||||||
0xa6, 0x0f, 0xd9, 0x97, 0x52, 0x04, 0x55, 0x68, 0x30, 0x1a, 0x30, 0x3a, 0x39, 0x5c, 0x78, 0x28,
|
|
||||||
0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x57, 0x3c,
|
|
||||||
0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x5f,
|
|
||||||
0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18,
|
|
||||||
0x6e, 0x3c, 0x96, 0x63, 0x88, 0xe2, 0x42, 0x98, 0x9a, 0xc4, 0x06, 0x0e, 0x78, 0x63, 0x40, 0x00,
|
|
||||||
0x00, 0x00, 0xff, 0xff, 0x6c, 0xe6, 0x6d, 0xb7, 0x85, 0x01, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
|
|
6
vendor/github.com/moby/buildkit/session/sshforward/sshprovider/agentprovider.go
generated
vendored
6
vendor/github.com/moby/buildkit/session/sshforward/sshprovider/agentprovider.go
generated
vendored
|
@ -178,7 +178,7 @@ type sock struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type readOnlyAgent struct {
|
type readOnlyAgent struct {
|
||||||
agent.Agent
|
agent.ExtendedAgent
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *readOnlyAgent) Add(_ agent.AddedKey) error {
|
func (a *readOnlyAgent) Add(_ agent.AddedKey) error {
|
||||||
|
@ -196,3 +196,7 @@ func (a *readOnlyAgent) RemoveAll() error {
|
||||||
func (a *readOnlyAgent) Lock(_ []byte) error {
|
func (a *readOnlyAgent) Lock(_ []byte) error {
|
||||||
return errors.Errorf("locking agent not allowed by buildkit")
|
return errors.Errorf("locking agent not allowed by buildkit")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *readOnlyAgent) Extension(_ string, _ []byte) ([]byte, error) {
|
||||||
|
return nil, errors.Errorf("extensions not allowed by buildkit")
|
||||||
|
}
|
||||||
|
|
|
@ -45,7 +45,10 @@ const (
|
||||||
CapExecMountSSH apicaps.CapID = "exec.mount.ssh"
|
CapExecMountSSH apicaps.CapID = "exec.mount.ssh"
|
||||||
CapExecCgroupsMounted apicaps.CapID = "exec.cgroup"
|
CapExecCgroupsMounted apicaps.CapID = "exec.cgroup"
|
||||||
|
|
||||||
|
CapExecMetaSecurityDeviceWhitelistV1 apicaps.CapID = "exec.meta.security.devices.v1"
|
||||||
|
|
||||||
CapFileBase apicaps.CapID = "file.base"
|
CapFileBase apicaps.CapID = "file.base"
|
||||||
|
CapFileRmWildcard apicaps.CapID = "file.rm.wildcard"
|
||||||
|
|
||||||
CapConstraints apicaps.CapID = "constraints"
|
CapConstraints apicaps.CapID = "constraints"
|
||||||
CapPlatform apicaps.CapID = "platform"
|
CapPlatform apicaps.CapID = "platform"
|
||||||
|
@ -188,6 +191,12 @@ func init() {
|
||||||
Status: apicaps.CapStatusExperimental,
|
Status: apicaps.CapStatusExperimental,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Caps.Init(apicaps.Cap{
|
||||||
|
ID: CapExecMetaSecurityDeviceWhitelistV1,
|
||||||
|
Enabled: true,
|
||||||
|
Status: apicaps.CapStatusExperimental,
|
||||||
|
})
|
||||||
|
|
||||||
Caps.Init(apicaps.Cap{
|
Caps.Init(apicaps.Cap{
|
||||||
ID: CapExecMountBind,
|
ID: CapExecMountBind,
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
|
@ -252,6 +261,12 @@ func init() {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Caps.Init(apicaps.Cap{
|
||||||
|
ID: CapFileRmWildcard,
|
||||||
|
Enabled: true,
|
||||||
|
Status: apicaps.CapStatusExperimental,
|
||||||
|
})
|
||||||
|
|
||||||
Caps.Init(apicaps.Cap{
|
Caps.Init(apicaps.Cap{
|
||||||
ID: CapConstraints,
|
ID: CapConstraints,
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
|
@ -281,5 +296,4 @@ func init() {
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
Status: apicaps.CapStatusExperimental,
|
Status: apicaps.CapStatusExperimental,
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -3,12 +3,14 @@
|
||||||
|
|
||||||
package moby_buildkit_v1_apicaps
|
package moby_buildkit_v1_apicaps
|
||||||
|
|
||||||
import proto "github.com/gogo/protobuf/proto"
|
import (
|
||||||
import fmt "fmt"
|
fmt "fmt"
|
||||||
import math "math"
|
_ "github.com/gogo/protobuf/gogoproto"
|
||||||
import _ "github.com/gogo/protobuf/gogoproto"
|
proto "github.com/gogo/protobuf/proto"
|
||||||
|
io "io"
|
||||||
import io "io"
|
math "math"
|
||||||
|
math_bits "math/bits"
|
||||||
|
)
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
|
@ -19,7 +21,7 @@ var _ = math.Inf
|
||||||
// is compatible with the proto package it is being compiled against.
|
// is compatible with the proto package it is being compiled against.
|
||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
// APICap defines a capability supported by the service
|
// APICap defines a capability supported by the service
|
||||||
type APICap struct {
|
type APICap struct {
|
||||||
|
@ -38,7 +40,7 @@ func (m *APICap) Reset() { *m = APICap{} }
|
||||||
func (m *APICap) String() string { return proto.CompactTextString(m) }
|
func (m *APICap) String() string { return proto.CompactTextString(m) }
|
||||||
func (*APICap) ProtoMessage() {}
|
func (*APICap) ProtoMessage() {}
|
||||||
func (*APICap) Descriptor() ([]byte, []int) {
|
func (*APICap) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_caps_04e1bcd232e9a565, []int{0}
|
return fileDescriptor_e19c39d9fcb89b83, []int{0}
|
||||||
}
|
}
|
||||||
func (m *APICap) XXX_Unmarshal(b []byte) error {
|
func (m *APICap) XXX_Unmarshal(b []byte) error {
|
||||||
return m.Unmarshal(b)
|
return m.Unmarshal(b)
|
||||||
|
@ -48,15 +50,15 @@ func (m *APICap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||||
return xxx_messageInfo_APICap.Marshal(b, m, deterministic)
|
return xxx_messageInfo_APICap.Marshal(b, m, deterministic)
|
||||||
} else {
|
} else {
|
||||||
b = b[:cap(b)]
|
b = b[:cap(b)]
|
||||||
n, err := m.MarshalTo(b)
|
n, err := m.MarshalToSizedBuffer(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return b[:n], nil
|
return b[:n], nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func (dst *APICap) XXX_Merge(src proto.Message) {
|
func (m *APICap) XXX_Merge(src proto.Message) {
|
||||||
xxx_messageInfo_APICap.Merge(dst, src)
|
xxx_messageInfo_APICap.Merge(m, src)
|
||||||
}
|
}
|
||||||
func (m *APICap) XXX_Size() int {
|
func (m *APICap) XXX_Size() int {
|
||||||
return m.Size()
|
return m.Size()
|
||||||
|
@ -112,10 +114,32 @@ func (m *APICap) GetDisabledAlternative() string {
|
||||||
func init() {
|
func init() {
|
||||||
proto.RegisterType((*APICap)(nil), "moby.buildkit.v1.apicaps.APICap")
|
proto.RegisterType((*APICap)(nil), "moby.buildkit.v1.apicaps.APICap")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() { proto.RegisterFile("caps.proto", fileDescriptor_e19c39d9fcb89b83) }
|
||||||
|
|
||||||
|
var fileDescriptor_e19c39d9fcb89b83 = []byte{
|
||||||
|
// 236 bytes of a gzipped FileDescriptorProto
|
||||||
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0x4e, 0x2c, 0x28,
|
||||||
|
0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc8, 0xcd, 0x4f, 0xaa, 0xd4, 0x4b, 0x2a, 0xcd,
|
||||||
|
0xcc, 0x49, 0xc9, 0xce, 0x2c, 0xd1, 0x2b, 0x33, 0xd4, 0x4b, 0x2c, 0xc8, 0x04, 0xc9, 0x4b, 0xe9,
|
||||||
|
0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb,
|
||||||
|
0x83, 0x35, 0x24, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0x31, 0x48, 0xe9, 0x16, 0x23,
|
||||||
|
0x17, 0x9b, 0x63, 0x80, 0xa7, 0x73, 0x62, 0x81, 0x10, 0x1f, 0x17, 0x93, 0xa7, 0x8b, 0x04, 0xa3,
|
||||||
|
0x02, 0xa3, 0x06, 0x67, 0x10, 0x93, 0xa7, 0x8b, 0x90, 0x04, 0x17, 0xbb, 0x6b, 0x5e, 0x62, 0x52,
|
||||||
|
0x4e, 0x6a, 0x8a, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x47, 0x10, 0x8c, 0x2b, 0x24, 0xc7, 0xc5, 0xe5,
|
||||||
|
0x92, 0x5a, 0x50, 0x94, 0x9a, 0x9c, 0x58, 0x92, 0x9a, 0x22, 0xc1, 0x0c, 0x96, 0x44, 0x12, 0x11,
|
||||||
|
0x52, 0xe3, 0xe2, 0x73, 0xc9, 0x2c, 0x06, 0xab, 0x0d, 0x4a, 0x4d, 0x2c, 0xce, 0xcf, 0x93, 0x60,
|
||||||
|
0x01, 0x9b, 0x8a, 0x26, 0x2a, 0xa4, 0xc3, 0x25, 0x88, 0x2a, 0xe2, 0x5b, 0x9c, 0x2e, 0xc1, 0x0a,
|
||||||
|
0x56, 0x8a, 0x29, 0x21, 0x64, 0xc0, 0x25, 0x0c, 0x13, 0x74, 0xcc, 0x29, 0x49, 0x2d, 0xca, 0x4b,
|
||||||
|
0x2c, 0xc9, 0x2c, 0x4b, 0x95, 0x60, 0x03, 0xab, 0xc7, 0x26, 0xe5, 0xc4, 0x73, 0xe2, 0x91, 0x1c,
|
||||||
|
0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x26, 0xb1, 0x81, 0x7d, 0x6c, 0x0c, 0x08,
|
||||||
|
0x00, 0x00, 0xff, 0xff, 0x02, 0x2d, 0x9e, 0x91, 0x48, 0x01, 0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
func (m *APICap) Marshal() (dAtA []byte, err error) {
|
func (m *APICap) Marshal() (dAtA []byte, err error) {
|
||||||
size := m.Size()
|
size := m.Size()
|
||||||
dAtA = make([]byte, size)
|
dAtA = make([]byte, size)
|
||||||
n, err := m.MarshalTo(dAtA)
|
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -123,68 +147,80 @@ func (m *APICap) Marshal() (dAtA []byte, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *APICap) MarshalTo(dAtA []byte) (int, error) {
|
func (m *APICap) MarshalTo(dAtA []byte) (int, error) {
|
||||||
var i int
|
size := m.Size()
|
||||||
|
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *APICap) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||||
|
i := len(dAtA)
|
||||||
_ = i
|
_ = i
|
||||||
var l int
|
var l int
|
||||||
_ = l
|
_ = l
|
||||||
if len(m.ID) > 0 {
|
if m.XXX_unrecognized != nil {
|
||||||
dAtA[i] = 0xa
|
i -= len(m.XXX_unrecognized)
|
||||||
i++
|
copy(dAtA[i:], m.XXX_unrecognized)
|
||||||
i = encodeVarintCaps(dAtA, i, uint64(len(m.ID)))
|
|
||||||
i += copy(dAtA[i:], m.ID)
|
|
||||||
}
|
|
||||||
if m.Enabled {
|
|
||||||
dAtA[i] = 0x10
|
|
||||||
i++
|
|
||||||
if m.Enabled {
|
|
||||||
dAtA[i] = 1
|
|
||||||
} else {
|
|
||||||
dAtA[i] = 0
|
|
||||||
}
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
if m.Deprecated {
|
|
||||||
dAtA[i] = 0x18
|
|
||||||
i++
|
|
||||||
if m.Deprecated {
|
|
||||||
dAtA[i] = 1
|
|
||||||
} else {
|
|
||||||
dAtA[i] = 0
|
|
||||||
}
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
if len(m.DisabledReason) > 0 {
|
|
||||||
dAtA[i] = 0x22
|
|
||||||
i++
|
|
||||||
i = encodeVarintCaps(dAtA, i, uint64(len(m.DisabledReason)))
|
|
||||||
i += copy(dAtA[i:], m.DisabledReason)
|
|
||||||
}
|
|
||||||
if len(m.DisabledReasonMsg) > 0 {
|
|
||||||
dAtA[i] = 0x2a
|
|
||||||
i++
|
|
||||||
i = encodeVarintCaps(dAtA, i, uint64(len(m.DisabledReasonMsg)))
|
|
||||||
i += copy(dAtA[i:], m.DisabledReasonMsg)
|
|
||||||
}
|
}
|
||||||
if len(m.DisabledAlternative) > 0 {
|
if len(m.DisabledAlternative) > 0 {
|
||||||
dAtA[i] = 0x32
|
i -= len(m.DisabledAlternative)
|
||||||
i++
|
copy(dAtA[i:], m.DisabledAlternative)
|
||||||
i = encodeVarintCaps(dAtA, i, uint64(len(m.DisabledAlternative)))
|
i = encodeVarintCaps(dAtA, i, uint64(len(m.DisabledAlternative)))
|
||||||
i += copy(dAtA[i:], m.DisabledAlternative)
|
i--
|
||||||
|
dAtA[i] = 0x32
|
||||||
}
|
}
|
||||||
if m.XXX_unrecognized != nil {
|
if len(m.DisabledReasonMsg) > 0 {
|
||||||
i += copy(dAtA[i:], m.XXX_unrecognized)
|
i -= len(m.DisabledReasonMsg)
|
||||||
|
copy(dAtA[i:], m.DisabledReasonMsg)
|
||||||
|
i = encodeVarintCaps(dAtA, i, uint64(len(m.DisabledReasonMsg)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x2a
|
||||||
}
|
}
|
||||||
return i, nil
|
if len(m.DisabledReason) > 0 {
|
||||||
|
i -= len(m.DisabledReason)
|
||||||
|
copy(dAtA[i:], m.DisabledReason)
|
||||||
|
i = encodeVarintCaps(dAtA, i, uint64(len(m.DisabledReason)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x22
|
||||||
|
}
|
||||||
|
if m.Deprecated {
|
||||||
|
i--
|
||||||
|
if m.Deprecated {
|
||||||
|
dAtA[i] = 1
|
||||||
|
} else {
|
||||||
|
dAtA[i] = 0
|
||||||
|
}
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x18
|
||||||
|
}
|
||||||
|
if m.Enabled {
|
||||||
|
i--
|
||||||
|
if m.Enabled {
|
||||||
|
dAtA[i] = 1
|
||||||
|
} else {
|
||||||
|
dAtA[i] = 0
|
||||||
|
}
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0x10
|
||||||
|
}
|
||||||
|
if len(m.ID) > 0 {
|
||||||
|
i -= len(m.ID)
|
||||||
|
copy(dAtA[i:], m.ID)
|
||||||
|
i = encodeVarintCaps(dAtA, i, uint64(len(m.ID)))
|
||||||
|
i--
|
||||||
|
dAtA[i] = 0xa
|
||||||
|
}
|
||||||
|
return len(dAtA) - i, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func encodeVarintCaps(dAtA []byte, offset int, v uint64) int {
|
func encodeVarintCaps(dAtA []byte, offset int, v uint64) int {
|
||||||
|
offset -= sovCaps(v)
|
||||||
|
base := offset
|
||||||
for v >= 1<<7 {
|
for v >= 1<<7 {
|
||||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||||
v >>= 7
|
v >>= 7
|
||||||
offset++
|
offset++
|
||||||
}
|
}
|
||||||
dAtA[offset] = uint8(v)
|
dAtA[offset] = uint8(v)
|
||||||
return offset + 1
|
return base
|
||||||
}
|
}
|
||||||
func (m *APICap) Size() (n int) {
|
func (m *APICap) Size() (n int) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -221,14 +257,7 @@ func (m *APICap) Size() (n int) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sovCaps(x uint64) (n int) {
|
func sovCaps(x uint64) (n int) {
|
||||||
for {
|
return (math_bits.Len64(x|1) + 6) / 7
|
||||||
n++
|
|
||||||
x >>= 7
|
|
||||||
if x == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return n
|
|
||||||
}
|
}
|
||||||
func sozCaps(x uint64) (n int) {
|
func sozCaps(x uint64) (n int) {
|
||||||
return sovCaps(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
return sovCaps(uint64((x << 1) ^ uint64((int64(x) >> 63))))
|
||||||
|
@ -248,7 +277,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
wire |= (uint64(b) & 0x7F) << shift
|
wire |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -276,7 +305,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -286,6 +315,9 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthCaps
|
return ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthCaps
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -305,7 +337,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
v |= (int(b) & 0x7F) << shift
|
v |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -325,7 +357,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
v |= (int(b) & 0x7F) << shift
|
v |= int(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -345,7 +377,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -355,6 +387,9 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthCaps
|
return ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthCaps
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -374,7 +409,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -384,6 +419,9 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthCaps
|
return ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthCaps
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -403,7 +441,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
}
|
}
|
||||||
b := dAtA[iNdEx]
|
b := dAtA[iNdEx]
|
||||||
iNdEx++
|
iNdEx++
|
||||||
stringLen |= (uint64(b) & 0x7F) << shift
|
stringLen |= uint64(b&0x7F) << shift
|
||||||
if b < 0x80 {
|
if b < 0x80 {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -413,6 +451,9 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
return ErrInvalidLengthCaps
|
return ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
postIndex := iNdEx + intStringLen
|
postIndex := iNdEx + intStringLen
|
||||||
|
if postIndex < 0 {
|
||||||
|
return ErrInvalidLengthCaps
|
||||||
|
}
|
||||||
if postIndex > l {
|
if postIndex > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -427,6 +468,9 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
if skippy < 0 {
|
if skippy < 0 {
|
||||||
return ErrInvalidLengthCaps
|
return ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
|
if (iNdEx + skippy) < 0 {
|
||||||
|
return ErrInvalidLengthCaps
|
||||||
|
}
|
||||||
if (iNdEx + skippy) > l {
|
if (iNdEx + skippy) > l {
|
||||||
return io.ErrUnexpectedEOF
|
return io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
@ -443,6 +487,7 @@ func (m *APICap) Unmarshal(dAtA []byte) error {
|
||||||
func skipCaps(dAtA []byte) (n int, err error) {
|
func skipCaps(dAtA []byte) (n int, err error) {
|
||||||
l := len(dAtA)
|
l := len(dAtA)
|
||||||
iNdEx := 0
|
iNdEx := 0
|
||||||
|
depth := 0
|
||||||
for iNdEx < l {
|
for iNdEx < l {
|
||||||
var wire uint64
|
var wire uint64
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -474,10 +519,8 @@ func skipCaps(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
|
||||||
case 1:
|
case 1:
|
||||||
iNdEx += 8
|
iNdEx += 8
|
||||||
return iNdEx, nil
|
|
||||||
case 2:
|
case 2:
|
||||||
var length int
|
var length int
|
||||||
for shift := uint(0); ; shift += 7 {
|
for shift := uint(0); ; shift += 7 {
|
||||||
|
@ -494,74 +537,34 @@ func skipCaps(dAtA []byte) (n int, err error) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
iNdEx += length
|
|
||||||
if length < 0 {
|
if length < 0 {
|
||||||
return 0, ErrInvalidLengthCaps
|
return 0, ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
return iNdEx, nil
|
iNdEx += length
|
||||||
case 3:
|
case 3:
|
||||||
for {
|
depth++
|
||||||
var innerWire uint64
|
|
||||||
var start int = iNdEx
|
|
||||||
for shift := uint(0); ; shift += 7 {
|
|
||||||
if shift >= 64 {
|
|
||||||
return 0, ErrIntOverflowCaps
|
|
||||||
}
|
|
||||||
if iNdEx >= l {
|
|
||||||
return 0, io.ErrUnexpectedEOF
|
|
||||||
}
|
|
||||||
b := dAtA[iNdEx]
|
|
||||||
iNdEx++
|
|
||||||
innerWire |= (uint64(b) & 0x7F) << shift
|
|
||||||
if b < 0x80 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
innerWireType := int(innerWire & 0x7)
|
|
||||||
if innerWireType == 4 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
next, err := skipCaps(dAtA[start:])
|
|
||||||
if err != nil {
|
|
||||||
return 0, err
|
|
||||||
}
|
|
||||||
iNdEx = start + next
|
|
||||||
}
|
|
||||||
return iNdEx, nil
|
|
||||||
case 4:
|
case 4:
|
||||||
return iNdEx, nil
|
if depth == 0 {
|
||||||
|
return 0, ErrUnexpectedEndOfGroupCaps
|
||||||
|
}
|
||||||
|
depth--
|
||||||
case 5:
|
case 5:
|
||||||
iNdEx += 4
|
iNdEx += 4
|
||||||
return iNdEx, nil
|
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
|
||||||
}
|
}
|
||||||
|
if iNdEx < 0 {
|
||||||
|
return 0, ErrInvalidLengthCaps
|
||||||
}
|
}
|
||||||
panic("unreachable")
|
if depth == 0 {
|
||||||
|
return iNdEx, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, io.ErrUnexpectedEOF
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrInvalidLengthCaps = fmt.Errorf("proto: negative length found during unmarshaling")
|
ErrInvalidLengthCaps = fmt.Errorf("proto: negative length found during unmarshaling")
|
||||||
ErrIntOverflowCaps = fmt.Errorf("proto: integer overflow")
|
ErrIntOverflowCaps = fmt.Errorf("proto: integer overflow")
|
||||||
|
ErrUnexpectedEndOfGroupCaps = fmt.Errorf("proto: unexpected end of group")
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() { proto.RegisterFile("caps.proto", fileDescriptor_caps_04e1bcd232e9a565) }
|
|
||||||
|
|
||||||
var fileDescriptor_caps_04e1bcd232e9a565 = []byte{
|
|
||||||
// 236 bytes of a gzipped FileDescriptorProto
|
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0x4e, 0x2c, 0x28,
|
|
||||||
0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc8, 0xcd, 0x4f, 0xaa, 0xd4, 0x4b, 0x2a, 0xcd,
|
|
||||||
0xcc, 0x49, 0xc9, 0xce, 0x2c, 0xd1, 0x2b, 0x33, 0xd4, 0x4b, 0x2c, 0xc8, 0x04, 0xc9, 0x4b, 0xe9,
|
|
||||||
0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb,
|
|
||||||
0x83, 0x35, 0x24, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0x31, 0x48, 0xe9, 0x16, 0x23,
|
|
||||||
0x17, 0x9b, 0x63, 0x80, 0xa7, 0x73, 0x62, 0x81, 0x10, 0x1f, 0x17, 0x93, 0xa7, 0x8b, 0x04, 0xa3,
|
|
||||||
0x02, 0xa3, 0x06, 0x67, 0x10, 0x93, 0xa7, 0x8b, 0x90, 0x04, 0x17, 0xbb, 0x6b, 0x5e, 0x62, 0x52,
|
|
||||||
0x4e, 0x6a, 0x8a, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x47, 0x10, 0x8c, 0x2b, 0x24, 0xc7, 0xc5, 0xe5,
|
|
||||||
0x92, 0x5a, 0x50, 0x94, 0x9a, 0x9c, 0x58, 0x92, 0x9a, 0x22, 0xc1, 0x0c, 0x96, 0x44, 0x12, 0x11,
|
|
||||||
0x52, 0xe3, 0xe2, 0x73, 0xc9, 0x2c, 0x06, 0xab, 0x0d, 0x4a, 0x4d, 0x2c, 0xce, 0xcf, 0x93, 0x60,
|
|
||||||
0x01, 0x9b, 0x8a, 0x26, 0x2a, 0xa4, 0xc3, 0x25, 0x88, 0x2a, 0xe2, 0x5b, 0x9c, 0x2e, 0xc1, 0x0a,
|
|
||||||
0x56, 0x8a, 0x29, 0x21, 0x64, 0xc0, 0x25, 0x0c, 0x13, 0x74, 0xcc, 0x29, 0x49, 0x2d, 0xca, 0x4b,
|
|
||||||
0x2c, 0xc9, 0x2c, 0x4b, 0x95, 0x60, 0x03, 0xab, 0xc7, 0x26, 0xe5, 0xc4, 0x73, 0xe2, 0x91, 0x1c,
|
|
||||||
0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x26, 0xb1, 0x81, 0x7d, 0x6c, 0x0c, 0x08,
|
|
||||||
0x00, 0x00, 0xff, 0xff, 0x02, 0x2d, 0x9e, 0x91, 0x48, 0x01, 0x00, 0x00,
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,9 +1,17 @@
|
||||||
package appdefaults
|
package appdefaults
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
Address = "npipe:////./pipe/buildkitd"
|
Address = "npipe:////./pipe/buildkitd"
|
||||||
Root = ".buildstate"
|
)
|
||||||
ConfigDir = ""
|
|
||||||
|
var (
|
||||||
|
Root = filepath.Join(os.Getenv("ProgramData"), "buildkitd", ".buildstate")
|
||||||
|
ConfigDir = filepath.Join(os.Getenv("ProgramData"), "buildkitd")
|
||||||
)
|
)
|
||||||
|
|
||||||
func UserAddress() string {
|
func UserAddress() string {
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
package entitlements
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/containerd/containerd/containers"
|
|
||||||
"github.com/containerd/containerd/oci"
|
|
||||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WithInsecureSpec sets spec with All capability.
|
|
||||||
func WithInsecureSpec() oci.SpecOpts {
|
|
||||||
return func(_ context.Context, _ oci.Client, _ *containers.Container, s *specs.Spec) error {
|
|
||||||
addCaps := []string{
|
|
||||||
"CAP_FSETID",
|
|
||||||
"CAP_KILL",
|
|
||||||
"CAP_FOWNER",
|
|
||||||
"CAP_MKNOD",
|
|
||||||
"CAP_CHOWN",
|
|
||||||
"CAP_DAC_OVERRIDE",
|
|
||||||
"CAP_NET_RAW",
|
|
||||||
"CAP_SETGID",
|
|
||||||
"CAP_SETUID",
|
|
||||||
"CAP_SETPCAP",
|
|
||||||
"CAP_SETFCAP",
|
|
||||||
"CAP_NET_BIND_SERVICE",
|
|
||||||
"CAP_SYS_CHROOT",
|
|
||||||
"CAP_AUDIT_WRITE",
|
|
||||||
"CAP_MAC_ADMIN",
|
|
||||||
"CAP_MAC_OVERRIDE",
|
|
||||||
"CAP_DAC_READ_SEARCH",
|
|
||||||
"CAP_SYS_PTRACE",
|
|
||||||
"CAP_SYS_MODULE",
|
|
||||||
"CAP_SYSLOG",
|
|
||||||
"CAP_SYS_RAWIO",
|
|
||||||
"CAP_SYS_ADMIN",
|
|
||||||
"CAP_LINUX_IMMUTABLE",
|
|
||||||
"CAP_SYS_BOOT",
|
|
||||||
"CAP_SYS_NICE",
|
|
||||||
"CAP_SYS_PACCT",
|
|
||||||
"CAP_SYS_TTY_CONFIG",
|
|
||||||
"CAP_SYS_TIME",
|
|
||||||
"CAP_WAKE_ALARM",
|
|
||||||
"CAP_AUDIT_READ",
|
|
||||||
"CAP_AUDIT_CONTROL",
|
|
||||||
"CAP_SYS_RESOURCE",
|
|
||||||
"CAP_BLOCK_SUSPEND",
|
|
||||||
"CAP_IPC_LOCK",
|
|
||||||
"CAP_IPC_OWNER",
|
|
||||||
"CAP_LEASE",
|
|
||||||
"CAP_NET_ADMIN",
|
|
||||||
"CAP_NET_BROADCAST",
|
|
||||||
}
|
|
||||||
for _, cap := range addCaps {
|
|
||||||
s.Process.Capabilities.Bounding = append(s.Process.Capabilities.Bounding, cap)
|
|
||||||
s.Process.Capabilities.Ambient = append(s.Process.Capabilities.Ambient, cap)
|
|
||||||
s.Process.Capabilities.Effective = append(s.Process.Capabilities.Effective, cap)
|
|
||||||
s.Process.Capabilities.Inheritable = append(s.Process.Capabilities.Inheritable, cap)
|
|
||||||
s.Process.Capabilities.Permitted = append(s.Process.Capabilities.Permitted, cap)
|
|
||||||
}
|
|
||||||
s.Linux.ReadonlyPaths = []string{}
|
|
||||||
s.Linux.MaskedPaths = []string{}
|
|
||||||
s.Process.ApparmorProfile = ""
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
341
vendor/github.com/moby/buildkit/util/flightcontrol/flightcontrol.go
generated
vendored
Normal file
341
vendor/github.com/moby/buildkit/util/flightcontrol/flightcontrol.go
generated
vendored
Normal file
|
@ -0,0 +1,341 @@
|
||||||
|
package flightcontrol
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"runtime"
|
||||||
|
"sort"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/moby/buildkit/util/progress"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
)
|
||||||
|
|
||||||
|
// flightcontrol is like singleflight but with support for cancellation and
|
||||||
|
// nested progress reporting
|
||||||
|
|
||||||
|
var (
|
||||||
|
errRetry = errors.Errorf("retry")
|
||||||
|
errRetryTimeout = errors.Errorf("exceeded retry timeout")
|
||||||
|
)
|
||||||
|
|
||||||
|
type contextKeyT string
|
||||||
|
|
||||||
|
var contextKey = contextKeyT("buildkit/util/flightcontrol.progress")
|
||||||
|
|
||||||
|
// Group is a flightcontrol synchronization group
|
||||||
|
type Group struct {
|
||||||
|
mu sync.Mutex // protects m
|
||||||
|
m map[string]*call // lazily initialized
|
||||||
|
}
|
||||||
|
|
||||||
|
// Do executes a context function syncronized by the key
|
||||||
|
func (g *Group) Do(ctx context.Context, key string, fn func(ctx context.Context) (interface{}, error)) (v interface{}, err error) {
|
||||||
|
var backoff time.Duration
|
||||||
|
for {
|
||||||
|
v, err = g.do(ctx, key, fn)
|
||||||
|
if err == nil || errors.Cause(err) != errRetry {
|
||||||
|
return v, err
|
||||||
|
}
|
||||||
|
// backoff logic
|
||||||
|
if backoff >= 3*time.Second {
|
||||||
|
err = errors.Wrapf(errRetryTimeout, "flightcontrol")
|
||||||
|
return v, err
|
||||||
|
}
|
||||||
|
runtime.Gosched()
|
||||||
|
if backoff > 0 {
|
||||||
|
time.Sleep(backoff)
|
||||||
|
backoff *= 2
|
||||||
|
} else {
|
||||||
|
backoff = time.Millisecond
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *Group) do(ctx context.Context, key string, fn func(ctx context.Context) (interface{}, error)) (interface{}, error) {
|
||||||
|
g.mu.Lock()
|
||||||
|
if g.m == nil {
|
||||||
|
g.m = make(map[string]*call)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c, ok := g.m[key]; ok { // register 2nd waiter
|
||||||
|
g.mu.Unlock()
|
||||||
|
return c.wait(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
c := newCall(fn)
|
||||||
|
g.m[key] = c
|
||||||
|
go func() {
|
||||||
|
// cleanup after a caller has returned
|
||||||
|
<-c.ready
|
||||||
|
g.mu.Lock()
|
||||||
|
delete(g.m, key)
|
||||||
|
g.mu.Unlock()
|
||||||
|
close(c.cleaned)
|
||||||
|
}()
|
||||||
|
g.mu.Unlock()
|
||||||
|
return c.wait(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
type call struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
result interface{}
|
||||||
|
err error
|
||||||
|
ready chan struct{}
|
||||||
|
cleaned chan struct{}
|
||||||
|
|
||||||
|
ctx *sharedContext
|
||||||
|
ctxs []context.Context
|
||||||
|
fn func(ctx context.Context) (interface{}, error)
|
||||||
|
once sync.Once
|
||||||
|
|
||||||
|
closeProgressWriter func()
|
||||||
|
progressState *progressState
|
||||||
|
progressCtx context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
func newCall(fn func(ctx context.Context) (interface{}, error)) *call {
|
||||||
|
c := &call{
|
||||||
|
fn: fn,
|
||||||
|
ready: make(chan struct{}),
|
||||||
|
cleaned: make(chan struct{}),
|
||||||
|
progressState: newProgressState(),
|
||||||
|
}
|
||||||
|
ctx := newContext(c) // newSharedContext
|
||||||
|
pr, pctx, closeProgressWriter := progress.NewContext(context.Background())
|
||||||
|
|
||||||
|
c.progressCtx = pctx
|
||||||
|
c.ctx = ctx
|
||||||
|
c.closeProgressWriter = closeProgressWriter
|
||||||
|
|
||||||
|
go c.progressState.run(pr) // TODO: remove this, wrap writer instead
|
||||||
|
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *call) run() {
|
||||||
|
defer c.closeProgressWriter()
|
||||||
|
ctx, cancel := context.WithCancel(c.ctx)
|
||||||
|
defer cancel()
|
||||||
|
v, err := c.fn(ctx)
|
||||||
|
c.mu.Lock()
|
||||||
|
c.result = v
|
||||||
|
c.err = err
|
||||||
|
c.mu.Unlock()
|
||||||
|
close(c.ready)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *call) wait(ctx context.Context) (v interface{}, err error) {
|
||||||
|
c.mu.Lock()
|
||||||
|
// detect case where caller has just returned, let it clean up before
|
||||||
|
select {
|
||||||
|
case <-c.ready: // could return if no error
|
||||||
|
c.mu.Unlock()
|
||||||
|
<-c.cleaned
|
||||||
|
return nil, errRetry
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
|
pw, ok, ctx := progress.FromContext(ctx)
|
||||||
|
if ok {
|
||||||
|
c.progressState.add(pw)
|
||||||
|
}
|
||||||
|
c.ctxs = append(c.ctxs, ctx)
|
||||||
|
|
||||||
|
c.mu.Unlock()
|
||||||
|
|
||||||
|
go c.once.Do(c.run)
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
select {
|
||||||
|
case <-c.ctx.Done():
|
||||||
|
// if this cancelled the last context, then wait for function to shut down
|
||||||
|
// and don't accept any more callers
|
||||||
|
<-c.ready
|
||||||
|
return c.result, c.err
|
||||||
|
default:
|
||||||
|
if ok {
|
||||||
|
c.progressState.close(pw)
|
||||||
|
}
|
||||||
|
return nil, ctx.Err()
|
||||||
|
}
|
||||||
|
case <-c.ready:
|
||||||
|
return c.result, c.err // shared not implemented yet
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *call) Deadline() (deadline time.Time, ok bool) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
for _, ctx := range c.ctxs {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
default:
|
||||||
|
dl, ok := ctx.Deadline()
|
||||||
|
if ok {
|
||||||
|
return dl, ok
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return time.Time{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *call) Done() <-chan struct{} {
|
||||||
|
c.mu.Lock()
|
||||||
|
c.ctx.signal()
|
||||||
|
c.mu.Unlock()
|
||||||
|
return c.ctx.done
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *call) Err() error {
|
||||||
|
select {
|
||||||
|
case <-c.ctx.Done():
|
||||||
|
return c.ctx.err
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *call) Value(key interface{}) interface{} {
|
||||||
|
if key == contextKey {
|
||||||
|
return c.progressState
|
||||||
|
}
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
|
||||||
|
ctx := c.progressCtx
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
default:
|
||||||
|
if v := ctx.Value(key); v != nil {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(c.ctxs) > 0 {
|
||||||
|
ctx = c.ctxs[0]
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
default:
|
||||||
|
if v := ctx.Value(key); v != nil {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type sharedContext struct {
|
||||||
|
*call
|
||||||
|
done chan struct{}
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func newContext(c *call) *sharedContext {
|
||||||
|
return &sharedContext{call: c, done: make(chan struct{})}
|
||||||
|
}
|
||||||
|
|
||||||
|
// call with lock
|
||||||
|
func (c *sharedContext) signal() {
|
||||||
|
select {
|
||||||
|
case <-c.done:
|
||||||
|
default:
|
||||||
|
var err error
|
||||||
|
for _, ctx := range c.ctxs {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
err = ctx.Err()
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.err = err
|
||||||
|
close(c.done)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type rawProgressWriter interface {
|
||||||
|
WriteRawProgress(*progress.Progress) error
|
||||||
|
Close() error
|
||||||
|
}
|
||||||
|
|
||||||
|
type progressState struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
items map[string]*progress.Progress
|
||||||
|
writers []rawProgressWriter
|
||||||
|
done bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func newProgressState() *progressState {
|
||||||
|
return &progressState{
|
||||||
|
items: make(map[string]*progress.Progress),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *progressState) run(pr progress.Reader) {
|
||||||
|
for {
|
||||||
|
p, err := pr.Read(context.TODO())
|
||||||
|
if err != nil {
|
||||||
|
if err == io.EOF {
|
||||||
|
ps.mu.Lock()
|
||||||
|
ps.done = true
|
||||||
|
ps.mu.Unlock()
|
||||||
|
for _, w := range ps.writers {
|
||||||
|
w.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ps.mu.Lock()
|
||||||
|
for _, p := range p {
|
||||||
|
for _, w := range ps.writers {
|
||||||
|
w.WriteRawProgress(p)
|
||||||
|
}
|
||||||
|
ps.items[p.ID] = p
|
||||||
|
}
|
||||||
|
ps.mu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *progressState) add(pw progress.Writer) {
|
||||||
|
rw, ok := pw.(rawProgressWriter)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ps.mu.Lock()
|
||||||
|
plist := make([]*progress.Progress, 0, len(ps.items))
|
||||||
|
for _, p := range ps.items {
|
||||||
|
plist = append(plist, p)
|
||||||
|
}
|
||||||
|
sort.Slice(plist, func(i, j int) bool {
|
||||||
|
return plist[i].Timestamp.Before(plist[j].Timestamp)
|
||||||
|
})
|
||||||
|
for _, p := range plist {
|
||||||
|
rw.WriteRawProgress(p)
|
||||||
|
}
|
||||||
|
if ps.done {
|
||||||
|
rw.Close()
|
||||||
|
} else {
|
||||||
|
ps.writers = append(ps.writers, rw)
|
||||||
|
}
|
||||||
|
ps.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *progressState) close(pw progress.Writer) {
|
||||||
|
rw, ok := pw.(rawProgressWriter)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ps.mu.Lock()
|
||||||
|
for i, w := range ps.writers {
|
||||||
|
if w == rw {
|
||||||
|
w.Close()
|
||||||
|
ps.writers = append(ps.writers[:i], ps.writers[i+1:]...)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ps.mu.Unlock()
|
||||||
|
}
|
|
@ -0,0 +1,77 @@
|
||||||
|
package progress
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MultiReader struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
main Reader
|
||||||
|
initialized bool
|
||||||
|
done chan struct{}
|
||||||
|
writers map[*progressWriter]func()
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMultiReader(pr Reader) *MultiReader {
|
||||||
|
mr := &MultiReader{
|
||||||
|
main: pr,
|
||||||
|
writers: make(map[*progressWriter]func()),
|
||||||
|
done: make(chan struct{}),
|
||||||
|
}
|
||||||
|
return mr
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mr *MultiReader) Reader(ctx context.Context) Reader {
|
||||||
|
mr.mu.Lock()
|
||||||
|
defer mr.mu.Unlock()
|
||||||
|
|
||||||
|
pr, ctx, closeWriter := NewContext(ctx)
|
||||||
|
pw, _, ctx := FromContext(ctx)
|
||||||
|
|
||||||
|
w := pw.(*progressWriter)
|
||||||
|
mr.writers[w] = closeWriter
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
case <-mr.done:
|
||||||
|
}
|
||||||
|
mr.mu.Lock()
|
||||||
|
defer mr.mu.Unlock()
|
||||||
|
delete(mr.writers, w)
|
||||||
|
}()
|
||||||
|
|
||||||
|
if !mr.initialized {
|
||||||
|
go mr.handle()
|
||||||
|
mr.initialized = true
|
||||||
|
}
|
||||||
|
|
||||||
|
return pr
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mr *MultiReader) handle() error {
|
||||||
|
for {
|
||||||
|
p, err := mr.main.Read(context.TODO())
|
||||||
|
if err != nil {
|
||||||
|
if err == io.EOF {
|
||||||
|
mr.mu.Lock()
|
||||||
|
for w, c := range mr.writers {
|
||||||
|
w.Close()
|
||||||
|
c()
|
||||||
|
}
|
||||||
|
mr.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
mr.mu.Lock()
|
||||||
|
for _, p := range p {
|
||||||
|
for w := range mr.writers {
|
||||||
|
w.writeRawProgress(p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mr.mu.Unlock()
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,105 @@
|
||||||
|
package progress
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sort"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type rawProgressWriter interface {
|
||||||
|
WriteRawProgress(*Progress) error
|
||||||
|
Close() error
|
||||||
|
}
|
||||||
|
|
||||||
|
type MultiWriter struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
items []*Progress
|
||||||
|
writers map[rawProgressWriter]struct{}
|
||||||
|
done bool
|
||||||
|
meta map[string]interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMultiWriter(opts ...WriterOption) *MultiWriter {
|
||||||
|
mw := &MultiWriter{
|
||||||
|
writers: map[rawProgressWriter]struct{}{},
|
||||||
|
meta: map[string]interface{}{},
|
||||||
|
}
|
||||||
|
for _, o := range opts {
|
||||||
|
o(mw)
|
||||||
|
}
|
||||||
|
return mw
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *MultiWriter) Add(pw Writer) {
|
||||||
|
rw, ok := pw.(rawProgressWriter)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ps.mu.Lock()
|
||||||
|
plist := make([]*Progress, 0, len(ps.items))
|
||||||
|
for _, p := range ps.items {
|
||||||
|
plist = append(plist, p)
|
||||||
|
}
|
||||||
|
sort.Slice(plist, func(i, j int) bool {
|
||||||
|
return plist[i].Timestamp.Before(plist[j].Timestamp)
|
||||||
|
})
|
||||||
|
for _, p := range plist {
|
||||||
|
rw.WriteRawProgress(p)
|
||||||
|
}
|
||||||
|
ps.writers[rw] = struct{}{}
|
||||||
|
ps.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *MultiWriter) Delete(pw Writer) {
|
||||||
|
rw, ok := pw.(rawProgressWriter)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ps.mu.Lock()
|
||||||
|
delete(ps.writers, rw)
|
||||||
|
ps.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *MultiWriter) Write(id string, v interface{}) error {
|
||||||
|
p := &Progress{
|
||||||
|
ID: id,
|
||||||
|
Timestamp: time.Now(),
|
||||||
|
Sys: v,
|
||||||
|
meta: ps.meta,
|
||||||
|
}
|
||||||
|
return ps.WriteRawProgress(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *MultiWriter) WriteRawProgress(p *Progress) error {
|
||||||
|
meta := p.meta
|
||||||
|
if len(ps.meta) > 0 {
|
||||||
|
meta = map[string]interface{}{}
|
||||||
|
for k, v := range p.meta {
|
||||||
|
meta[k] = v
|
||||||
|
}
|
||||||
|
for k, v := range ps.meta {
|
||||||
|
if _, ok := meta[k]; !ok {
|
||||||
|
meta[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.meta = meta
|
||||||
|
return ps.writeRawProgress(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *MultiWriter) writeRawProgress(p *Progress) error {
|
||||||
|
ps.mu.Lock()
|
||||||
|
defer ps.mu.Unlock()
|
||||||
|
ps.items = append(ps.items, p)
|
||||||
|
for w := range ps.writers {
|
||||||
|
if err := w.WriteRawProgress(p); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ps *MultiWriter) Close() error {
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -0,0 +1,256 @@
|
||||||
|
package progress
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"sort"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Progress package provides utility functions for using the context to capture
|
||||||
|
// progress of a running function. All progress items written contain an ID
|
||||||
|
// that is used to collapse unread messages.
|
||||||
|
|
||||||
|
type contextKeyT string
|
||||||
|
|
||||||
|
var contextKey = contextKeyT("buildkit/util/progress")
|
||||||
|
|
||||||
|
// FromContext returns a progress writer from a context.
|
||||||
|
func FromContext(ctx context.Context, opts ...WriterOption) (Writer, bool, context.Context) {
|
||||||
|
v := ctx.Value(contextKey)
|
||||||
|
pw, ok := v.(*progressWriter)
|
||||||
|
if !ok {
|
||||||
|
if pw, ok := v.(*MultiWriter); ok {
|
||||||
|
return pw, true, ctx
|
||||||
|
}
|
||||||
|
return &noOpWriter{}, false, ctx
|
||||||
|
}
|
||||||
|
pw = newWriter(pw)
|
||||||
|
for _, o := range opts {
|
||||||
|
o(pw)
|
||||||
|
}
|
||||||
|
ctx = context.WithValue(ctx, contextKey, pw)
|
||||||
|
return pw, true, ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
type WriterOption func(Writer)
|
||||||
|
|
||||||
|
// NewContext returns a new context and a progress reader that captures all
|
||||||
|
// progress items writtern to this context. Last returned parameter is a closer
|
||||||
|
// function to signal that no new writes will happen to this context.
|
||||||
|
func NewContext(ctx context.Context) (Reader, context.Context, func()) {
|
||||||
|
pr, pw, cancel := pipe()
|
||||||
|
ctx = WithProgress(ctx, pw)
|
||||||
|
return pr, ctx, cancel
|
||||||
|
}
|
||||||
|
|
||||||
|
func WithProgress(ctx context.Context, pw Writer) context.Context {
|
||||||
|
return context.WithValue(ctx, contextKey, pw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func WithMetadata(key string, val interface{}) WriterOption {
|
||||||
|
return func(w Writer) {
|
||||||
|
if pw, ok := w.(*progressWriter); ok {
|
||||||
|
pw.meta[key] = val
|
||||||
|
}
|
||||||
|
if pw, ok := w.(*MultiWriter); ok {
|
||||||
|
pw.meta[key] = val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Writer interface {
|
||||||
|
Write(id string, value interface{}) error
|
||||||
|
Close() error
|
||||||
|
}
|
||||||
|
|
||||||
|
type Reader interface {
|
||||||
|
Read(context.Context) ([]*Progress, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type Progress struct {
|
||||||
|
ID string
|
||||||
|
Timestamp time.Time
|
||||||
|
Sys interface{}
|
||||||
|
meta map[string]interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Status struct {
|
||||||
|
Action string
|
||||||
|
Current int
|
||||||
|
Total int
|
||||||
|
Started *time.Time
|
||||||
|
Completed *time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
type progressReader struct {
|
||||||
|
ctx context.Context
|
||||||
|
cond *sync.Cond
|
||||||
|
mu sync.Mutex
|
||||||
|
writers map[*progressWriter]struct{}
|
||||||
|
dirty map[string]*Progress
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pr *progressReader) Read(ctx context.Context) ([]*Progress, error) {
|
||||||
|
done := make(chan struct{})
|
||||||
|
defer close(done)
|
||||||
|
go func() {
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
case <-ctx.Done():
|
||||||
|
pr.mu.Lock()
|
||||||
|
pr.cond.Broadcast()
|
||||||
|
pr.mu.Unlock()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
pr.mu.Lock()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
pr.mu.Unlock()
|
||||||
|
return nil, ctx.Err()
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
dmap := pr.dirty
|
||||||
|
if len(dmap) == 0 {
|
||||||
|
select {
|
||||||
|
case <-pr.ctx.Done():
|
||||||
|
if len(pr.writers) == 0 {
|
||||||
|
pr.mu.Unlock()
|
||||||
|
return nil, io.EOF
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
pr.cond.Wait()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
pr.dirty = make(map[string]*Progress)
|
||||||
|
pr.mu.Unlock()
|
||||||
|
|
||||||
|
out := make([]*Progress, 0, len(dmap))
|
||||||
|
for _, p := range dmap {
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
return out[i].Timestamp.Before(out[j].Timestamp)
|
||||||
|
})
|
||||||
|
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pr *progressReader) append(pw *progressWriter) {
|
||||||
|
pr.mu.Lock()
|
||||||
|
defer pr.mu.Unlock()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-pr.ctx.Done():
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
pr.writers[pw] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func pipe() (*progressReader, *progressWriter, func()) {
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
pr := &progressReader{
|
||||||
|
ctx: ctx,
|
||||||
|
writers: make(map[*progressWriter]struct{}),
|
||||||
|
dirty: make(map[string]*Progress),
|
||||||
|
}
|
||||||
|
pr.cond = sync.NewCond(&pr.mu)
|
||||||
|
go func() {
|
||||||
|
<-ctx.Done()
|
||||||
|
pr.mu.Lock()
|
||||||
|
pr.cond.Broadcast()
|
||||||
|
pr.mu.Unlock()
|
||||||
|
}()
|
||||||
|
pw := &progressWriter{
|
||||||
|
reader: pr,
|
||||||
|
}
|
||||||
|
return pr, pw, cancel
|
||||||
|
}
|
||||||
|
|
||||||
|
func newWriter(pw *progressWriter) *progressWriter {
|
||||||
|
meta := make(map[string]interface{})
|
||||||
|
for k, v := range pw.meta {
|
||||||
|
meta[k] = v
|
||||||
|
}
|
||||||
|
pw = &progressWriter{
|
||||||
|
reader: pw.reader,
|
||||||
|
meta: meta,
|
||||||
|
}
|
||||||
|
pw.reader.append(pw)
|
||||||
|
return pw
|
||||||
|
}
|
||||||
|
|
||||||
|
type progressWriter struct {
|
||||||
|
done bool
|
||||||
|
reader *progressReader
|
||||||
|
meta map[string]interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pw *progressWriter) Write(id string, v interface{}) error {
|
||||||
|
if pw.done {
|
||||||
|
return errors.Errorf("writing %s to closed progress writer", id)
|
||||||
|
}
|
||||||
|
return pw.writeRawProgress(&Progress{
|
||||||
|
ID: id,
|
||||||
|
Timestamp: time.Now(),
|
||||||
|
Sys: v,
|
||||||
|
meta: pw.meta,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pw *progressWriter) WriteRawProgress(p *Progress) error {
|
||||||
|
meta := p.meta
|
||||||
|
if len(pw.meta) > 0 {
|
||||||
|
meta = map[string]interface{}{}
|
||||||
|
for k, v := range p.meta {
|
||||||
|
meta[k] = v
|
||||||
|
}
|
||||||
|
for k, v := range pw.meta {
|
||||||
|
if _, ok := meta[k]; !ok {
|
||||||
|
meta[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.meta = meta
|
||||||
|
return pw.writeRawProgress(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pw *progressWriter) writeRawProgress(p *Progress) error {
|
||||||
|
pw.reader.mu.Lock()
|
||||||
|
pw.reader.dirty[p.ID] = p
|
||||||
|
pw.reader.cond.Broadcast()
|
||||||
|
pw.reader.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pw *progressWriter) Close() error {
|
||||||
|
pw.reader.mu.Lock()
|
||||||
|
delete(pw.reader.writers, pw)
|
||||||
|
pw.reader.mu.Unlock()
|
||||||
|
pw.reader.cond.Broadcast()
|
||||||
|
pw.done = true
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Progress) Meta(key string) (interface{}, bool) {
|
||||||
|
v, ok := p.meta[key]
|
||||||
|
return v, ok
|
||||||
|
}
|
||||||
|
|
||||||
|
type noOpWriter struct{}
|
||||||
|
|
||||||
|
func (pw *noOpWriter) Write(_ string, _ interface{}) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pw *noOpWriter) Close() error {
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -1,191 +0,0 @@
|
||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
Copyright 2015 The Linux Foundation.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
|
@ -1,153 +0,0 @@
|
||||||
# Open Container Initiative Runtime Specification
|
|
||||||
|
|
||||||
The [Open Container Initiative][oci] develops specifications for standards on Operating System process and application containers.
|
|
||||||
|
|
||||||
The specification can be found [here](spec.md).
|
|
||||||
|
|
||||||
## Table of Contents
|
|
||||||
|
|
||||||
Additional documentation about how this group operates:
|
|
||||||
|
|
||||||
- [Code of Conduct][code-of-conduct]
|
|
||||||
- [Style and Conventions](style.md)
|
|
||||||
- [Implementations](implementations.md)
|
|
||||||
- [Releases](RELEASES.md)
|
|
||||||
- [project](project.md)
|
|
||||||
- [charter][charter]
|
|
||||||
|
|
||||||
## Use Cases
|
|
||||||
|
|
||||||
To provide context for users the following section gives example use cases for each part of the spec.
|
|
||||||
|
|
||||||
### Application Bundle Builders
|
|
||||||
|
|
||||||
Application bundle builders can create a [bundle](bundle.md) directory that includes all of the files required for launching an application as a container.
|
|
||||||
The bundle contains an OCI [configuration file](config.md) where the builder can specify host-independent details such as [which executable to launch](config.md#process) and host-specific settings such as [mount](config.md#mounts) locations, [hook](config.md#posix-platform-hooks) paths, Linux [namespaces](config-linux.md#namespaces) and [cgroups](config-linux.md#control-groups).
|
|
||||||
Because the configuration includes host-specific settings, application bundle directories copied between two hosts may require configuration adjustments.
|
|
||||||
|
|
||||||
### Hook Developers
|
|
||||||
|
|
||||||
[Hook](config.md#posix-platform-hooks) developers can extend the functionality of an OCI-compliant runtime by hooking into a container's lifecycle with an external application.
|
|
||||||
Example use cases include sophisticated network configuration, volume garbage collection, etc.
|
|
||||||
|
|
||||||
### Runtime Developers
|
|
||||||
|
|
||||||
Runtime developers can build runtime implementations that run OCI-compliant bundles and container configuration, containing low-level OS and host-specific details, on a particular platform.
|
|
||||||
|
|
||||||
## Contributing
|
|
||||||
|
|
||||||
Development happens on GitHub for the spec.
|
|
||||||
Issues are used for bugs and actionable items and longer discussions can happen on the [mailing list](#mailing-list).
|
|
||||||
|
|
||||||
The specification and code is licensed under the Apache 2.0 license found in the [LICENSE](./LICENSE) file.
|
|
||||||
|
|
||||||
### Discuss your design
|
|
||||||
|
|
||||||
The project welcomes submissions, but please let everyone know what you are working on.
|
|
||||||
|
|
||||||
Before undertaking a nontrivial change to this specification, send mail to the [mailing list](#mailing-list) to discuss what you plan to do.
|
|
||||||
This gives everyone a chance to validate the design, helps prevent duplication of effort, and ensures that the idea fits.
|
|
||||||
It also guarantees that the design is sound before code is written; a GitHub pull-request is not the place for high-level discussions.
|
|
||||||
|
|
||||||
Typos and grammatical errors can go straight to a pull-request.
|
|
||||||
When in doubt, start on the [mailing-list](#mailing-list).
|
|
||||||
|
|
||||||
### Meetings
|
|
||||||
|
|
||||||
The contributors and maintainers of all OCI projects have monthly meetings, which are usually at 2:00 PM (USA Pacific) on the first Wednesday of every month.
|
|
||||||
There is an [iCalendar][rfc5545] format for the meetings [here](meeting.ics).
|
|
||||||
Everyone is welcome to participate via [UberConference web][uberconference] or audio-only: +1 415 968 0849 (no PIN needed).
|
|
||||||
An initial agenda will be posted to the [mailing list](#mailing-list) in the week before each meeting, and everyone is welcome to propose additional topics or suggest other agenda alterations there.
|
|
||||||
Minutes are posted to the [mailing list](#mailing-list) and minutes from past calls are archived [here][minutes], with minutes from especially old meetings (September 2015 and earlier) archived [here][runtime-wiki].
|
|
||||||
|
|
||||||
### Mailing List
|
|
||||||
|
|
||||||
You can subscribe and join the mailing list on [Google Groups][dev-list].
|
|
||||||
|
|
||||||
### IRC
|
|
||||||
|
|
||||||
OCI discussion happens on #opencontainers on Freenode ([logs][irc-logs]).
|
|
||||||
|
|
||||||
### Git commit
|
|
||||||
|
|
||||||
#### Sign your work
|
|
||||||
|
|
||||||
The sign-off is a simple line at the end of the explanation for the patch, which certifies that you wrote it or otherwise have the right to pass it on as an open-source patch.
|
|
||||||
The rules are pretty simple: if you can certify the below (from http://developercertificate.org):
|
|
||||||
|
|
||||||
```
|
|
||||||
Developer Certificate of Origin
|
|
||||||
Version 1.1
|
|
||||||
|
|
||||||
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
|
|
||||||
660 York Street, Suite 102,
|
|
||||||
San Francisco, CA 94110 USA
|
|
||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies of this
|
|
||||||
license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
|
|
||||||
Developer's Certificate of Origin 1.1
|
|
||||||
|
|
||||||
By making a contribution to this project, I certify that:
|
|
||||||
|
|
||||||
(a) The contribution was created in whole or in part by me and I
|
|
||||||
have the right to submit it under the open source license
|
|
||||||
indicated in the file; or
|
|
||||||
|
|
||||||
(b) The contribution is based upon previous work that, to the best
|
|
||||||
of my knowledge, is covered under an appropriate open source
|
|
||||||
license and I have the right under that license to submit that
|
|
||||||
work with modifications, whether created in whole or in part
|
|
||||||
by me, under the same open source license (unless I am
|
|
||||||
permitted to submit under a different license), as indicated
|
|
||||||
in the file; or
|
|
||||||
|
|
||||||
(c) The contribution was provided directly to me by some other
|
|
||||||
person who certified (a), (b) or (c) and I have not modified
|
|
||||||
it.
|
|
||||||
|
|
||||||
(d) I understand and agree that this project and the contribution
|
|
||||||
are public and that a record of the contribution (including all
|
|
||||||
personal information I submit with it, including my sign-off) is
|
|
||||||
maintained indefinitely and may be redistributed consistent with
|
|
||||||
this project or the open source license(s) involved.
|
|
||||||
```
|
|
||||||
|
|
||||||
then you just add a line to every git commit message:
|
|
||||||
|
|
||||||
Signed-off-by: Joe Smith <joe@gmail.com>
|
|
||||||
|
|
||||||
using your real name (sorry, no pseudonyms or anonymous contributions.)
|
|
||||||
|
|
||||||
You can add the sign off when creating the git commit via `git commit -s`.
|
|
||||||
|
|
||||||
#### Commit Style
|
|
||||||
|
|
||||||
Simple house-keeping for clean git history.
|
|
||||||
Read more on [How to Write a Git Commit Message][how-to-git-commit] or the Discussion section of [git-commit(1)][git-commit.1].
|
|
||||||
|
|
||||||
1. Separate the subject from body with a blank line
|
|
||||||
2. Limit the subject line to 50 characters
|
|
||||||
3. Capitalize the subject line
|
|
||||||
4. Do not end the subject line with a period
|
|
||||||
5. Use the imperative mood in the subject line
|
|
||||||
6. Wrap the body at 72 characters
|
|
||||||
7. Use the body to explain what and why vs. how
|
|
||||||
* If there was important/useful/essential conversation or information, copy or include a reference
|
|
||||||
8. When possible, one keyword to scope the change in the subject (i.e. "README: ...", "runtime: ...")
|
|
||||||
|
|
||||||
|
|
||||||
[charter]: https://www.opencontainers.org/about/governance
|
|
||||||
[code-of-conduct]: https://github.com/opencontainers/tob/blob/master/code-of-conduct.md
|
|
||||||
[dev-list]: https://groups.google.com/a/opencontainers.org/forum/#!forum/dev
|
|
||||||
[how-to-git-commit]: http://chris.beams.io/posts/git-commit
|
|
||||||
[irc-logs]: http://ircbot.wl.linuxfoundation.org/eavesdrop/%23opencontainers/
|
|
||||||
[iso-week]: https://en.wikipedia.org/wiki/ISO_week_date#Calculating_the_week_number_of_a_given_date
|
|
||||||
[minutes]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/
|
|
||||||
[oci]: https://www.opencontainers.org
|
|
||||||
[rfc5545]: https://tools.ietf.org/html/rfc5545
|
|
||||||
[runtime-wiki]: https://github.com/opencontainers/runtime-spec/wiki
|
|
||||||
[uberconference]: https://www.uberconference.com/opencontainers
|
|
||||||
|
|
||||||
[git-commit.1]: http://git-scm.com/docs/git-commit
|
|
|
@ -1,642 +0,0 @@
|
||||||
package specs
|
|
||||||
|
|
||||||
import "os"
|
|
||||||
|
|
||||||
// Spec is the base configuration for the container.
|
|
||||||
type Spec struct {
|
|
||||||
// Version of the Open Container Initiative Runtime Specification with which the bundle complies.
|
|
||||||
Version string `json:"ociVersion"`
|
|
||||||
// Process configures the container process.
|
|
||||||
Process *Process `json:"process,omitempty"`
|
|
||||||
// Root configures the container's root filesystem.
|
|
||||||
Root *Root `json:"root,omitempty"`
|
|
||||||
// Hostname configures the container's hostname.
|
|
||||||
Hostname string `json:"hostname,omitempty"`
|
|
||||||
// Mounts configures additional mounts (on top of Root).
|
|
||||||
Mounts []Mount `json:"mounts,omitempty"`
|
|
||||||
// Hooks configures callbacks for container lifecycle events.
|
|
||||||
Hooks *Hooks `json:"hooks,omitempty" platform:"linux,solaris"`
|
|
||||||
// Annotations contains arbitrary metadata for the container.
|
|
||||||
Annotations map[string]string `json:"annotations,omitempty"`
|
|
||||||
|
|
||||||
// Linux is platform-specific configuration for Linux based containers.
|
|
||||||
Linux *Linux `json:"linux,omitempty" platform:"linux"`
|
|
||||||
// Solaris is platform-specific configuration for Solaris based containers.
|
|
||||||
Solaris *Solaris `json:"solaris,omitempty" platform:"solaris"`
|
|
||||||
// Windows is platform-specific configuration for Windows based containers.
|
|
||||||
Windows *Windows `json:"windows,omitempty" platform:"windows"`
|
|
||||||
// VM specifies configuration for virtual-machine-based containers.
|
|
||||||
VM *VM `json:"vm,omitempty" platform:"vm"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process contains information to start a specific application inside the container.
|
|
||||||
type Process struct {
|
|
||||||
// Terminal creates an interactive terminal for the container.
|
|
||||||
Terminal bool `json:"terminal,omitempty"`
|
|
||||||
// ConsoleSize specifies the size of the console.
|
|
||||||
ConsoleSize *Box `json:"consoleSize,omitempty"`
|
|
||||||
// User specifies user information for the process.
|
|
||||||
User User `json:"user"`
|
|
||||||
// Args specifies the binary and arguments for the application to execute.
|
|
||||||
Args []string `json:"args,omitempty"`
|
|
||||||
// CommandLine specifies the full command line for the application to execute on Windows.
|
|
||||||
CommandLine string `json:"commandLine,omitempty" platform:"windows"`
|
|
||||||
// Env populates the process environment for the process.
|
|
||||||
Env []string `json:"env,omitempty"`
|
|
||||||
// Cwd is the current working directory for the process and must be
|
|
||||||
// relative to the container's root.
|
|
||||||
Cwd string `json:"cwd"`
|
|
||||||
// Capabilities are Linux capabilities that are kept for the process.
|
|
||||||
Capabilities *LinuxCapabilities `json:"capabilities,omitempty" platform:"linux"`
|
|
||||||
// Rlimits specifies rlimit options to apply to the process.
|
|
||||||
Rlimits []POSIXRlimit `json:"rlimits,omitempty" platform:"linux,solaris"`
|
|
||||||
// NoNewPrivileges controls whether additional privileges could be gained by processes in the container.
|
|
||||||
NoNewPrivileges bool `json:"noNewPrivileges,omitempty" platform:"linux"`
|
|
||||||
// ApparmorProfile specifies the apparmor profile for the container.
|
|
||||||
ApparmorProfile string `json:"apparmorProfile,omitempty" platform:"linux"`
|
|
||||||
// Specify an oom_score_adj for the container.
|
|
||||||
OOMScoreAdj *int `json:"oomScoreAdj,omitempty" platform:"linux"`
|
|
||||||
// SelinuxLabel specifies the selinux context that the container process is run as.
|
|
||||||
SelinuxLabel string `json:"selinuxLabel,omitempty" platform:"linux"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxCapabilities specifies the whitelist of capabilities that are kept for a process.
|
|
||||||
// http://man7.org/linux/man-pages/man7/capabilities.7.html
|
|
||||||
type LinuxCapabilities struct {
|
|
||||||
// Bounding is the set of capabilities checked by the kernel.
|
|
||||||
Bounding []string `json:"bounding,omitempty" platform:"linux"`
|
|
||||||
// Effective is the set of capabilities checked by the kernel.
|
|
||||||
Effective []string `json:"effective,omitempty" platform:"linux"`
|
|
||||||
// Inheritable is the capabilities preserved across execve.
|
|
||||||
Inheritable []string `json:"inheritable,omitempty" platform:"linux"`
|
|
||||||
// Permitted is the limiting superset for effective capabilities.
|
|
||||||
Permitted []string `json:"permitted,omitempty" platform:"linux"`
|
|
||||||
// Ambient is the ambient set of capabilities that are kept.
|
|
||||||
Ambient []string `json:"ambient,omitempty" platform:"linux"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Box specifies dimensions of a rectangle. Used for specifying the size of a console.
|
|
||||||
type Box struct {
|
|
||||||
// Height is the vertical dimension of a box.
|
|
||||||
Height uint `json:"height"`
|
|
||||||
// Width is the horizontal dimension of a box.
|
|
||||||
Width uint `json:"width"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// User specifies specific user (and group) information for the container process.
|
|
||||||
type User struct {
|
|
||||||
// UID is the user id.
|
|
||||||
UID uint32 `json:"uid" platform:"linux,solaris"`
|
|
||||||
// GID is the group id.
|
|
||||||
GID uint32 `json:"gid" platform:"linux,solaris"`
|
|
||||||
// AdditionalGids are additional group ids set for the container's process.
|
|
||||||
AdditionalGids []uint32 `json:"additionalGids,omitempty" platform:"linux,solaris"`
|
|
||||||
// Username is the user name.
|
|
||||||
Username string `json:"username,omitempty" platform:"windows"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Root contains information about the container's root filesystem on the host.
|
|
||||||
type Root struct {
|
|
||||||
// Path is the absolute path to the container's root filesystem.
|
|
||||||
Path string `json:"path"`
|
|
||||||
// Readonly makes the root filesystem for the container readonly before the process is executed.
|
|
||||||
Readonly bool `json:"readonly,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mount specifies a mount for a container.
|
|
||||||
type Mount struct {
|
|
||||||
// Destination is the absolute path where the mount will be placed in the container.
|
|
||||||
Destination string `json:"destination"`
|
|
||||||
// Type specifies the mount kind.
|
|
||||||
Type string `json:"type,omitempty" platform:"linux,solaris"`
|
|
||||||
// Source specifies the source path of the mount.
|
|
||||||
Source string `json:"source,omitempty"`
|
|
||||||
// Options are fstab style mount options.
|
|
||||||
Options []string `json:"options,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hook specifies a command that is run at a particular event in the lifecycle of a container
|
|
||||||
type Hook struct {
|
|
||||||
Path string `json:"path"`
|
|
||||||
Args []string `json:"args,omitempty"`
|
|
||||||
Env []string `json:"env,omitempty"`
|
|
||||||
Timeout *int `json:"timeout,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hooks for container setup and teardown
|
|
||||||
type Hooks struct {
|
|
||||||
// Prestart is a list of hooks to be run before the container process is executed.
|
|
||||||
Prestart []Hook `json:"prestart,omitempty"`
|
|
||||||
// Poststart is a list of hooks to be run after the container process is started.
|
|
||||||
Poststart []Hook `json:"poststart,omitempty"`
|
|
||||||
// Poststop is a list of hooks to be run after the container process exits.
|
|
||||||
Poststop []Hook `json:"poststop,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Linux contains platform-specific configuration for Linux based containers.
|
|
||||||
type Linux struct {
|
|
||||||
// UIDMapping specifies user mappings for supporting user namespaces.
|
|
||||||
UIDMappings []LinuxIDMapping `json:"uidMappings,omitempty"`
|
|
||||||
// GIDMapping specifies group mappings for supporting user namespaces.
|
|
||||||
GIDMappings []LinuxIDMapping `json:"gidMappings,omitempty"`
|
|
||||||
// Sysctl are a set of key value pairs that are set for the container on start
|
|
||||||
Sysctl map[string]string `json:"sysctl,omitempty"`
|
|
||||||
// Resources contain cgroup information for handling resource constraints
|
|
||||||
// for the container
|
|
||||||
Resources *LinuxResources `json:"resources,omitempty"`
|
|
||||||
// CgroupsPath specifies the path to cgroups that are created and/or joined by the container.
|
|
||||||
// The path is expected to be relative to the cgroups mountpoint.
|
|
||||||
// If resources are specified, the cgroups at CgroupsPath will be updated based on resources.
|
|
||||||
CgroupsPath string `json:"cgroupsPath,omitempty"`
|
|
||||||
// Namespaces contains the namespaces that are created and/or joined by the container
|
|
||||||
Namespaces []LinuxNamespace `json:"namespaces,omitempty"`
|
|
||||||
// Devices are a list of device nodes that are created for the container
|
|
||||||
Devices []LinuxDevice `json:"devices,omitempty"`
|
|
||||||
// Seccomp specifies the seccomp security settings for the container.
|
|
||||||
Seccomp *LinuxSeccomp `json:"seccomp,omitempty"`
|
|
||||||
// RootfsPropagation is the rootfs mount propagation mode for the container.
|
|
||||||
RootfsPropagation string `json:"rootfsPropagation,omitempty"`
|
|
||||||
// MaskedPaths masks over the provided paths inside the container.
|
|
||||||
MaskedPaths []string `json:"maskedPaths,omitempty"`
|
|
||||||
// ReadonlyPaths sets the provided paths as RO inside the container.
|
|
||||||
ReadonlyPaths []string `json:"readonlyPaths,omitempty"`
|
|
||||||
// MountLabel specifies the selinux context for the mounts in the container.
|
|
||||||
MountLabel string `json:"mountLabel,omitempty"`
|
|
||||||
// IntelRdt contains Intel Resource Director Technology (RDT) information for
|
|
||||||
// handling resource constraints (e.g., L3 cache, memory bandwidth) for the container
|
|
||||||
IntelRdt *LinuxIntelRdt `json:"intelRdt,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxNamespace is the configuration for a Linux namespace
|
|
||||||
type LinuxNamespace struct {
|
|
||||||
// Type is the type of namespace
|
|
||||||
Type LinuxNamespaceType `json:"type"`
|
|
||||||
// Path is a path to an existing namespace persisted on disk that can be joined
|
|
||||||
// and is of the same type
|
|
||||||
Path string `json:"path,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxNamespaceType is one of the Linux namespaces
|
|
||||||
type LinuxNamespaceType string
|
|
||||||
|
|
||||||
const (
|
|
||||||
// PIDNamespace for isolating process IDs
|
|
||||||
PIDNamespace LinuxNamespaceType = "pid"
|
|
||||||
// NetworkNamespace for isolating network devices, stacks, ports, etc
|
|
||||||
NetworkNamespace = "network"
|
|
||||||
// MountNamespace for isolating mount points
|
|
||||||
MountNamespace = "mount"
|
|
||||||
// IPCNamespace for isolating System V IPC, POSIX message queues
|
|
||||||
IPCNamespace = "ipc"
|
|
||||||
// UTSNamespace for isolating hostname and NIS domain name
|
|
||||||
UTSNamespace = "uts"
|
|
||||||
// UserNamespace for isolating user and group IDs
|
|
||||||
UserNamespace = "user"
|
|
||||||
// CgroupNamespace for isolating cgroup hierarchies
|
|
||||||
CgroupNamespace = "cgroup"
|
|
||||||
)
|
|
||||||
|
|
||||||
// LinuxIDMapping specifies UID/GID mappings
|
|
||||||
type LinuxIDMapping struct {
|
|
||||||
// ContainerID is the starting UID/GID in the container
|
|
||||||
ContainerID uint32 `json:"containerID"`
|
|
||||||
// HostID is the starting UID/GID on the host to be mapped to 'ContainerID'
|
|
||||||
HostID uint32 `json:"hostID"`
|
|
||||||
// Size is the number of IDs to be mapped
|
|
||||||
Size uint32 `json:"size"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// POSIXRlimit type and restrictions
|
|
||||||
type POSIXRlimit struct {
|
|
||||||
// Type of the rlimit to set
|
|
||||||
Type string `json:"type"`
|
|
||||||
// Hard is the hard limit for the specified type
|
|
||||||
Hard uint64 `json:"hard"`
|
|
||||||
// Soft is the soft limit for the specified type
|
|
||||||
Soft uint64 `json:"soft"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxHugepageLimit structure corresponds to limiting kernel hugepages
|
|
||||||
type LinuxHugepageLimit struct {
|
|
||||||
// Pagesize is the hugepage size
|
|
||||||
Pagesize string `json:"pageSize"`
|
|
||||||
// Limit is the limit of "hugepagesize" hugetlb usage
|
|
||||||
Limit uint64 `json:"limit"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxInterfacePriority for network interfaces
|
|
||||||
type LinuxInterfacePriority struct {
|
|
||||||
// Name is the name of the network interface
|
|
||||||
Name string `json:"name"`
|
|
||||||
// Priority for the interface
|
|
||||||
Priority uint32 `json:"priority"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// linuxBlockIODevice holds major:minor format supported in blkio cgroup
|
|
||||||
type linuxBlockIODevice struct {
|
|
||||||
// Major is the device's major number.
|
|
||||||
Major int64 `json:"major"`
|
|
||||||
// Minor is the device's minor number.
|
|
||||||
Minor int64 `json:"minor"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxWeightDevice struct holds a `major:minor weight` pair for weightDevice
|
|
||||||
type LinuxWeightDevice struct {
|
|
||||||
linuxBlockIODevice
|
|
||||||
// Weight is the bandwidth rate for the device.
|
|
||||||
Weight *uint16 `json:"weight,omitempty"`
|
|
||||||
// LeafWeight is the bandwidth rate for the device while competing with the cgroup's child cgroups, CFQ scheduler only
|
|
||||||
LeafWeight *uint16 `json:"leafWeight,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxThrottleDevice struct holds a `major:minor rate_per_second` pair
|
|
||||||
type LinuxThrottleDevice struct {
|
|
||||||
linuxBlockIODevice
|
|
||||||
// Rate is the IO rate limit per cgroup per device
|
|
||||||
Rate uint64 `json:"rate"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxBlockIO for Linux cgroup 'blkio' resource management
|
|
||||||
type LinuxBlockIO struct {
|
|
||||||
// Specifies per cgroup weight
|
|
||||||
Weight *uint16 `json:"weight,omitempty"`
|
|
||||||
// Specifies tasks' weight in the given cgroup while competing with the cgroup's child cgroups, CFQ scheduler only
|
|
||||||
LeafWeight *uint16 `json:"leafWeight,omitempty"`
|
|
||||||
// Weight per cgroup per device, can override BlkioWeight
|
|
||||||
WeightDevice []LinuxWeightDevice `json:"weightDevice,omitempty"`
|
|
||||||
// IO read rate limit per cgroup per device, bytes per second
|
|
||||||
ThrottleReadBpsDevice []LinuxThrottleDevice `json:"throttleReadBpsDevice,omitempty"`
|
|
||||||
// IO write rate limit per cgroup per device, bytes per second
|
|
||||||
ThrottleWriteBpsDevice []LinuxThrottleDevice `json:"throttleWriteBpsDevice,omitempty"`
|
|
||||||
// IO read rate limit per cgroup per device, IO per second
|
|
||||||
ThrottleReadIOPSDevice []LinuxThrottleDevice `json:"throttleReadIOPSDevice,omitempty"`
|
|
||||||
// IO write rate limit per cgroup per device, IO per second
|
|
||||||
ThrottleWriteIOPSDevice []LinuxThrottleDevice `json:"throttleWriteIOPSDevice,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxMemory for Linux cgroup 'memory' resource management
|
|
||||||
type LinuxMemory struct {
|
|
||||||
// Memory limit (in bytes).
|
|
||||||
Limit *int64 `json:"limit,omitempty"`
|
|
||||||
// Memory reservation or soft_limit (in bytes).
|
|
||||||
Reservation *int64 `json:"reservation,omitempty"`
|
|
||||||
// Total memory limit (memory + swap).
|
|
||||||
Swap *int64 `json:"swap,omitempty"`
|
|
||||||
// Kernel memory limit (in bytes).
|
|
||||||
Kernel *int64 `json:"kernel,omitempty"`
|
|
||||||
// Kernel memory limit for tcp (in bytes)
|
|
||||||
KernelTCP *int64 `json:"kernelTCP,omitempty"`
|
|
||||||
// How aggressive the kernel will swap memory pages.
|
|
||||||
Swappiness *uint64 `json:"swappiness,omitempty"`
|
|
||||||
// DisableOOMKiller disables the OOM killer for out of memory conditions
|
|
||||||
DisableOOMKiller *bool `json:"disableOOMKiller,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxCPU for Linux cgroup 'cpu' resource management
|
|
||||||
type LinuxCPU struct {
|
|
||||||
// CPU shares (relative weight (ratio) vs. other cgroups with cpu shares).
|
|
||||||
Shares *uint64 `json:"shares,omitempty"`
|
|
||||||
// CPU hardcap limit (in usecs). Allowed cpu time in a given period.
|
|
||||||
Quota *int64 `json:"quota,omitempty"`
|
|
||||||
// CPU period to be used for hardcapping (in usecs).
|
|
||||||
Period *uint64 `json:"period,omitempty"`
|
|
||||||
// How much time realtime scheduling may use (in usecs).
|
|
||||||
RealtimeRuntime *int64 `json:"realtimeRuntime,omitempty"`
|
|
||||||
// CPU period to be used for realtime scheduling (in usecs).
|
|
||||||
RealtimePeriod *uint64 `json:"realtimePeriod,omitempty"`
|
|
||||||
// CPUs to use within the cpuset. Default is to use any CPU available.
|
|
||||||
Cpus string `json:"cpus,omitempty"`
|
|
||||||
// List of memory nodes in the cpuset. Default is to use any available memory node.
|
|
||||||
Mems string `json:"mems,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxPids for Linux cgroup 'pids' resource management (Linux 4.3)
|
|
||||||
type LinuxPids struct {
|
|
||||||
// Maximum number of PIDs. Default is "no limit".
|
|
||||||
Limit int64 `json:"limit"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxNetwork identification and priority configuration
|
|
||||||
type LinuxNetwork struct {
|
|
||||||
// Set class identifier for container's network packets
|
|
||||||
ClassID *uint32 `json:"classID,omitempty"`
|
|
||||||
// Set priority of network traffic for container
|
|
||||||
Priorities []LinuxInterfacePriority `json:"priorities,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxRdma for Linux cgroup 'rdma' resource management (Linux 4.11)
|
|
||||||
type LinuxRdma struct {
|
|
||||||
// Maximum number of HCA handles that can be opened. Default is "no limit".
|
|
||||||
HcaHandles *uint32 `json:"hcaHandles,omitempty"`
|
|
||||||
// Maximum number of HCA objects that can be created. Default is "no limit".
|
|
||||||
HcaObjects *uint32 `json:"hcaObjects,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxResources has container runtime resource constraints
|
|
||||||
type LinuxResources struct {
|
|
||||||
// Devices configures the device whitelist.
|
|
||||||
Devices []LinuxDeviceCgroup `json:"devices,omitempty"`
|
|
||||||
// Memory restriction configuration
|
|
||||||
Memory *LinuxMemory `json:"memory,omitempty"`
|
|
||||||
// CPU resource restriction configuration
|
|
||||||
CPU *LinuxCPU `json:"cpu,omitempty"`
|
|
||||||
// Task resource restriction configuration.
|
|
||||||
Pids *LinuxPids `json:"pids,omitempty"`
|
|
||||||
// BlockIO restriction configuration
|
|
||||||
BlockIO *LinuxBlockIO `json:"blockIO,omitempty"`
|
|
||||||
// Hugetlb limit (in bytes)
|
|
||||||
HugepageLimits []LinuxHugepageLimit `json:"hugepageLimits,omitempty"`
|
|
||||||
// Network restriction configuration
|
|
||||||
Network *LinuxNetwork `json:"network,omitempty"`
|
|
||||||
// Rdma resource restriction configuration.
|
|
||||||
// Limits are a set of key value pairs that define RDMA resource limits,
|
|
||||||
// where the key is device name and value is resource limits.
|
|
||||||
Rdma map[string]LinuxRdma `json:"rdma,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxDevice represents the mknod information for a Linux special device file
|
|
||||||
type LinuxDevice struct {
|
|
||||||
// Path to the device.
|
|
||||||
Path string `json:"path"`
|
|
||||||
// Device type, block, char, etc.
|
|
||||||
Type string `json:"type"`
|
|
||||||
// Major is the device's major number.
|
|
||||||
Major int64 `json:"major"`
|
|
||||||
// Minor is the device's minor number.
|
|
||||||
Minor int64 `json:"minor"`
|
|
||||||
// FileMode permission bits for the device.
|
|
||||||
FileMode *os.FileMode `json:"fileMode,omitempty"`
|
|
||||||
// UID of the device.
|
|
||||||
UID *uint32 `json:"uid,omitempty"`
|
|
||||||
// Gid of the device.
|
|
||||||
GID *uint32 `json:"gid,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxDeviceCgroup represents a device rule for the whitelist controller
|
|
||||||
type LinuxDeviceCgroup struct {
|
|
||||||
// Allow or deny
|
|
||||||
Allow bool `json:"allow"`
|
|
||||||
// Device type, block, char, etc.
|
|
||||||
Type string `json:"type,omitempty"`
|
|
||||||
// Major is the device's major number.
|
|
||||||
Major *int64 `json:"major,omitempty"`
|
|
||||||
// Minor is the device's minor number.
|
|
||||||
Minor *int64 `json:"minor,omitempty"`
|
|
||||||
// Cgroup access permissions format, rwm.
|
|
||||||
Access string `json:"access,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Solaris contains platform-specific configuration for Solaris application containers.
|
|
||||||
type Solaris struct {
|
|
||||||
// SMF FMRI which should go "online" before we start the container process.
|
|
||||||
Milestone string `json:"milestone,omitempty"`
|
|
||||||
// Maximum set of privileges any process in this container can obtain.
|
|
||||||
LimitPriv string `json:"limitpriv,omitempty"`
|
|
||||||
// The maximum amount of shared memory allowed for this container.
|
|
||||||
MaxShmMemory string `json:"maxShmMemory,omitempty"`
|
|
||||||
// Specification for automatic creation of network resources for this container.
|
|
||||||
Anet []SolarisAnet `json:"anet,omitempty"`
|
|
||||||
// Set limit on the amount of CPU time that can be used by container.
|
|
||||||
CappedCPU *SolarisCappedCPU `json:"cappedCPU,omitempty"`
|
|
||||||
// The physical and swap caps on the memory that can be used by this container.
|
|
||||||
CappedMemory *SolarisCappedMemory `json:"cappedMemory,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// SolarisCappedCPU allows users to set limit on the amount of CPU time that can be used by container.
|
|
||||||
type SolarisCappedCPU struct {
|
|
||||||
Ncpus string `json:"ncpus,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// SolarisCappedMemory allows users to set the physical and swap caps on the memory that can be used by this container.
|
|
||||||
type SolarisCappedMemory struct {
|
|
||||||
Physical string `json:"physical,omitempty"`
|
|
||||||
Swap string `json:"swap,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// SolarisAnet provides the specification for automatic creation of network resources for this container.
|
|
||||||
type SolarisAnet struct {
|
|
||||||
// Specify a name for the automatically created VNIC datalink.
|
|
||||||
Linkname string `json:"linkname,omitempty"`
|
|
||||||
// Specify the link over which the VNIC will be created.
|
|
||||||
Lowerlink string `json:"lowerLink,omitempty"`
|
|
||||||
// The set of IP addresses that the container can use.
|
|
||||||
Allowedaddr string `json:"allowedAddress,omitempty"`
|
|
||||||
// Specifies whether allowedAddress limitation is to be applied to the VNIC.
|
|
||||||
Configallowedaddr string `json:"configureAllowedAddress,omitempty"`
|
|
||||||
// The value of the optional default router.
|
|
||||||
Defrouter string `json:"defrouter,omitempty"`
|
|
||||||
// Enable one or more types of link protection.
|
|
||||||
Linkprotection string `json:"linkProtection,omitempty"`
|
|
||||||
// Set the VNIC's macAddress
|
|
||||||
Macaddress string `json:"macAddress,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Windows defines the runtime configuration for Windows based containers, including Hyper-V containers.
|
|
||||||
type Windows struct {
|
|
||||||
// LayerFolders contains a list of absolute paths to directories containing image layers.
|
|
||||||
LayerFolders []string `json:"layerFolders"`
|
|
||||||
// Devices are the list of devices to be mapped into the container.
|
|
||||||
Devices []WindowsDevice `json:"devices,omitempty"`
|
|
||||||
// Resources contains information for handling resource constraints for the container.
|
|
||||||
Resources *WindowsResources `json:"resources,omitempty"`
|
|
||||||
// CredentialSpec contains a JSON object describing a group Managed Service Account (gMSA) specification.
|
|
||||||
CredentialSpec interface{} `json:"credentialSpec,omitempty"`
|
|
||||||
// Servicing indicates if the container is being started in a mode to apply a Windows Update servicing operation.
|
|
||||||
Servicing bool `json:"servicing,omitempty"`
|
|
||||||
// IgnoreFlushesDuringBoot indicates if the container is being started in a mode where disk writes are not flushed during its boot process.
|
|
||||||
IgnoreFlushesDuringBoot bool `json:"ignoreFlushesDuringBoot,omitempty"`
|
|
||||||
// HyperV contains information for running a container with Hyper-V isolation.
|
|
||||||
HyperV *WindowsHyperV `json:"hyperv,omitempty"`
|
|
||||||
// Network restriction configuration.
|
|
||||||
Network *WindowsNetwork `json:"network,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsDevice represents information about a host device to be mapped into the container.
|
|
||||||
type WindowsDevice struct {
|
|
||||||
// Device identifier: interface class GUID, etc.
|
|
||||||
ID string `json:"id"`
|
|
||||||
// Device identifier type: "class", etc.
|
|
||||||
IDType string `json:"idType"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsResources has container runtime resource constraints for containers running on Windows.
|
|
||||||
type WindowsResources struct {
|
|
||||||
// Memory restriction configuration.
|
|
||||||
Memory *WindowsMemoryResources `json:"memory,omitempty"`
|
|
||||||
// CPU resource restriction configuration.
|
|
||||||
CPU *WindowsCPUResources `json:"cpu,omitempty"`
|
|
||||||
// Storage restriction configuration.
|
|
||||||
Storage *WindowsStorageResources `json:"storage,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsMemoryResources contains memory resource management settings.
|
|
||||||
type WindowsMemoryResources struct {
|
|
||||||
// Memory limit in bytes.
|
|
||||||
Limit *uint64 `json:"limit,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsCPUResources contains CPU resource management settings.
|
|
||||||
type WindowsCPUResources struct {
|
|
||||||
// Number of CPUs available to the container.
|
|
||||||
Count *uint64 `json:"count,omitempty"`
|
|
||||||
// CPU shares (relative weight to other containers with cpu shares).
|
|
||||||
Shares *uint16 `json:"shares,omitempty"`
|
|
||||||
// Specifies the portion of processor cycles that this container can use as a percentage times 100.
|
|
||||||
Maximum *uint16 `json:"maximum,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsStorageResources contains storage resource management settings.
|
|
||||||
type WindowsStorageResources struct {
|
|
||||||
// Specifies maximum Iops for the system drive.
|
|
||||||
Iops *uint64 `json:"iops,omitempty"`
|
|
||||||
// Specifies maximum bytes per second for the system drive.
|
|
||||||
Bps *uint64 `json:"bps,omitempty"`
|
|
||||||
// Sandbox size specifies the minimum size of the system drive in bytes.
|
|
||||||
SandboxSize *uint64 `json:"sandboxSize,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsNetwork contains network settings for Windows containers.
|
|
||||||
type WindowsNetwork struct {
|
|
||||||
// List of HNS endpoints that the container should connect to.
|
|
||||||
EndpointList []string `json:"endpointList,omitempty"`
|
|
||||||
// Specifies if unqualified DNS name resolution is allowed.
|
|
||||||
AllowUnqualifiedDNSQuery bool `json:"allowUnqualifiedDNSQuery,omitempty"`
|
|
||||||
// Comma separated list of DNS suffixes to use for name resolution.
|
|
||||||
DNSSearchList []string `json:"DNSSearchList,omitempty"`
|
|
||||||
// Name (ID) of the container that we will share with the network stack.
|
|
||||||
NetworkSharedContainerName string `json:"networkSharedContainerName,omitempty"`
|
|
||||||
// name (ID) of the network namespace that will be used for the container.
|
|
||||||
NetworkNamespace string `json:"networkNamespace,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WindowsHyperV contains information for configuring a container to run with Hyper-V isolation.
|
|
||||||
type WindowsHyperV struct {
|
|
||||||
// UtilityVMPath is an optional path to the image used for the Utility VM.
|
|
||||||
UtilityVMPath string `json:"utilityVMPath,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// VM contains information for virtual-machine-based containers.
|
|
||||||
type VM struct {
|
|
||||||
// Hypervisor specifies hypervisor-related configuration for virtual-machine-based containers.
|
|
||||||
Hypervisor VMHypervisor `json:"hypervisor,omitempty"`
|
|
||||||
// Kernel specifies kernel-related configuration for virtual-machine-based containers.
|
|
||||||
Kernel VMKernel `json:"kernel"`
|
|
||||||
// Image specifies guest image related configuration for virtual-machine-based containers.
|
|
||||||
Image VMImage `json:"image,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// VMHypervisor contains information about the hypervisor to use for a virtual machine.
|
|
||||||
type VMHypervisor struct {
|
|
||||||
// Path is the host path to the hypervisor used to manage the virtual machine.
|
|
||||||
Path string `json:"path"`
|
|
||||||
// Parameters specifies parameters to pass to the hypervisor.
|
|
||||||
Parameters []string `json:"parameters,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// VMKernel contains information about the kernel to use for a virtual machine.
|
|
||||||
type VMKernel struct {
|
|
||||||
// Path is the host path to the kernel used to boot the virtual machine.
|
|
||||||
Path string `json:"path"`
|
|
||||||
// Parameters specifies parameters to pass to the kernel.
|
|
||||||
Parameters []string `json:"parameters,omitempty"`
|
|
||||||
// InitRD is the host path to an initial ramdisk to be used by the kernel.
|
|
||||||
InitRD string `json:"initrd,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// VMImage contains information about the virtual machine root image.
|
|
||||||
type VMImage struct {
|
|
||||||
// Path is the host path to the root image that the VM kernel would boot into.
|
|
||||||
Path string `json:"path"`
|
|
||||||
// Format is the root image format type (e.g. "qcow2", "raw", "vhd", etc).
|
|
||||||
Format string `json:"format"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxSeccomp represents syscall restrictions
|
|
||||||
type LinuxSeccomp struct {
|
|
||||||
DefaultAction LinuxSeccompAction `json:"defaultAction"`
|
|
||||||
Architectures []Arch `json:"architectures,omitempty"`
|
|
||||||
Syscalls []LinuxSyscall `json:"syscalls,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Arch used for additional architectures
|
|
||||||
type Arch string
|
|
||||||
|
|
||||||
// Additional architectures permitted to be used for system calls
|
|
||||||
// By default only the native architecture of the kernel is permitted
|
|
||||||
const (
|
|
||||||
ArchX86 Arch = "SCMP_ARCH_X86"
|
|
||||||
ArchX86_64 Arch = "SCMP_ARCH_X86_64"
|
|
||||||
ArchX32 Arch = "SCMP_ARCH_X32"
|
|
||||||
ArchARM Arch = "SCMP_ARCH_ARM"
|
|
||||||
ArchAARCH64 Arch = "SCMP_ARCH_AARCH64"
|
|
||||||
ArchMIPS Arch = "SCMP_ARCH_MIPS"
|
|
||||||
ArchMIPS64 Arch = "SCMP_ARCH_MIPS64"
|
|
||||||
ArchMIPS64N32 Arch = "SCMP_ARCH_MIPS64N32"
|
|
||||||
ArchMIPSEL Arch = "SCMP_ARCH_MIPSEL"
|
|
||||||
ArchMIPSEL64 Arch = "SCMP_ARCH_MIPSEL64"
|
|
||||||
ArchMIPSEL64N32 Arch = "SCMP_ARCH_MIPSEL64N32"
|
|
||||||
ArchPPC Arch = "SCMP_ARCH_PPC"
|
|
||||||
ArchPPC64 Arch = "SCMP_ARCH_PPC64"
|
|
||||||
ArchPPC64LE Arch = "SCMP_ARCH_PPC64LE"
|
|
||||||
ArchS390 Arch = "SCMP_ARCH_S390"
|
|
||||||
ArchS390X Arch = "SCMP_ARCH_S390X"
|
|
||||||
ArchPARISC Arch = "SCMP_ARCH_PARISC"
|
|
||||||
ArchPARISC64 Arch = "SCMP_ARCH_PARISC64"
|
|
||||||
)
|
|
||||||
|
|
||||||
// LinuxSeccompAction taken upon Seccomp rule match
|
|
||||||
type LinuxSeccompAction string
|
|
||||||
|
|
||||||
// Define actions for Seccomp rules
|
|
||||||
const (
|
|
||||||
ActKill LinuxSeccompAction = "SCMP_ACT_KILL"
|
|
||||||
ActTrap LinuxSeccompAction = "SCMP_ACT_TRAP"
|
|
||||||
ActErrno LinuxSeccompAction = "SCMP_ACT_ERRNO"
|
|
||||||
ActTrace LinuxSeccompAction = "SCMP_ACT_TRACE"
|
|
||||||
ActAllow LinuxSeccompAction = "SCMP_ACT_ALLOW"
|
|
||||||
)
|
|
||||||
|
|
||||||
// LinuxSeccompOperator used to match syscall arguments in Seccomp
|
|
||||||
type LinuxSeccompOperator string
|
|
||||||
|
|
||||||
// Define operators for syscall arguments in Seccomp
|
|
||||||
const (
|
|
||||||
OpNotEqual LinuxSeccompOperator = "SCMP_CMP_NE"
|
|
||||||
OpLessThan LinuxSeccompOperator = "SCMP_CMP_LT"
|
|
||||||
OpLessEqual LinuxSeccompOperator = "SCMP_CMP_LE"
|
|
||||||
OpEqualTo LinuxSeccompOperator = "SCMP_CMP_EQ"
|
|
||||||
OpGreaterEqual LinuxSeccompOperator = "SCMP_CMP_GE"
|
|
||||||
OpGreaterThan LinuxSeccompOperator = "SCMP_CMP_GT"
|
|
||||||
OpMaskedEqual LinuxSeccompOperator = "SCMP_CMP_MASKED_EQ"
|
|
||||||
)
|
|
||||||
|
|
||||||
// LinuxSeccompArg used for matching specific syscall arguments in Seccomp
|
|
||||||
type LinuxSeccompArg struct {
|
|
||||||
Index uint `json:"index"`
|
|
||||||
Value uint64 `json:"value"`
|
|
||||||
ValueTwo uint64 `json:"valueTwo,omitempty"`
|
|
||||||
Op LinuxSeccompOperator `json:"op"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxSyscall is used to match a syscall in Seccomp
|
|
||||||
type LinuxSyscall struct {
|
|
||||||
Names []string `json:"names"`
|
|
||||||
Action LinuxSeccompAction `json:"action"`
|
|
||||||
Args []LinuxSeccompArg `json:"args,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// LinuxIntelRdt has container runtime resource constraints for Intel RDT
|
|
||||||
// CAT and MBA features which introduced in Linux 4.10 and 4.12 kernel
|
|
||||||
type LinuxIntelRdt struct {
|
|
||||||
// The identity for RDT Class of Service
|
|
||||||
ClosID string `json:"closID,omitempty"`
|
|
||||||
// The schema for L3 cache id and capacity bitmask (CBM)
|
|
||||||
// Format: "L3:<cache_id0>=<cbm0>;<cache_id1>=<cbm1>;..."
|
|
||||||
L3CacheSchema string `json:"l3CacheSchema,omitempty"`
|
|
||||||
|
|
||||||
// The schema of memory bandwidth per L3 cache id
|
|
||||||
// Format: "MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;..."
|
|
||||||
// The unit of memory bandwidth is specified in "percentages" by
|
|
||||||
// default, and in "MBps" if MBA Software Controller is enabled.
|
|
||||||
MemBwSchema string `json:"memBwSchema,omitempty"`
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
package specs
|
|
||||||
|
|
||||||
// State holds information about the runtime state of the container.
|
|
||||||
type State struct {
|
|
||||||
// Version is the version of the specification that is supported.
|
|
||||||
Version string `json:"ociVersion"`
|
|
||||||
// ID is the container ID
|
|
||||||
ID string `json:"id"`
|
|
||||||
// Status is the runtime status of the container.
|
|
||||||
Status string `json:"status"`
|
|
||||||
// Pid is the process ID for the container process.
|
|
||||||
Pid int `json:"pid,omitempty"`
|
|
||||||
// Bundle is the path to the container's bundle directory.
|
|
||||||
Bundle string `json:"bundle"`
|
|
||||||
// Annotations are key values associated with the container.
|
|
||||||
Annotations map[string]string `json:"annotations,omitempty"`
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
package specs
|
|
||||||
|
|
||||||
import "fmt"
|
|
||||||
|
|
||||||
const (
|
|
||||||
// VersionMajor is for an API incompatible changes
|
|
||||||
VersionMajor = 1
|
|
||||||
// VersionMinor is for functionality in a backwards-compatible manner
|
|
||||||
VersionMinor = 0
|
|
||||||
// VersionPatch is for backwards-compatible bug fixes
|
|
||||||
VersionPatch = 1
|
|
||||||
|
|
||||||
// VersionDev indicates development branch. Releases will be empty string.
|
|
||||||
VersionDev = "-dev"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Version is the specification version that the package types support.
|
|
||||||
var Version = fmt.Sprintf("%d.%d.%d%s", VersionMajor, VersionMinor, VersionPatch, VersionDev)
|
|
|
@ -1,24 +0,0 @@
|
||||||
Copyright 2013 Suryandaru Triandana <syndtr@gmail.com>
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions are
|
|
||||||
met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer.
|
|
||||||
* Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
@ -1,133 +0,0 @@
|
||||||
// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
// Package capability provides utilities for manipulating POSIX capabilities.
|
|
||||||
package capability
|
|
||||||
|
|
||||||
type Capabilities interface {
|
|
||||||
// Get check whether a capability present in the given
|
|
||||||
// capabilities set. The 'which' value should be one of EFFECTIVE,
|
|
||||||
// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
|
|
||||||
Get(which CapType, what Cap) bool
|
|
||||||
|
|
||||||
// Empty check whether all capability bits of the given capabilities
|
|
||||||
// set are zero. The 'which' value should be one of EFFECTIVE,
|
|
||||||
// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
|
|
||||||
Empty(which CapType) bool
|
|
||||||
|
|
||||||
// Full check whether all capability bits of the given capabilities
|
|
||||||
// set are one. The 'which' value should be one of EFFECTIVE,
|
|
||||||
// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
|
|
||||||
Full(which CapType) bool
|
|
||||||
|
|
||||||
// Set sets capabilities of the given capabilities sets. The
|
|
||||||
// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
|
|
||||||
// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
|
|
||||||
Set(which CapType, caps ...Cap)
|
|
||||||
|
|
||||||
// Unset unsets capabilities of the given capabilities sets. The
|
|
||||||
// 'which' value should be one or combination (OR'ed) of EFFECTIVE,
|
|
||||||
// PERMITTED, INHERITABLE, BOUNDING or AMBIENT.
|
|
||||||
Unset(which CapType, caps ...Cap)
|
|
||||||
|
|
||||||
// Fill sets all bits of the given capabilities kind to one. The
|
|
||||||
// 'kind' value should be one or combination (OR'ed) of CAPS,
|
|
||||||
// BOUNDS or AMBS.
|
|
||||||
Fill(kind CapType)
|
|
||||||
|
|
||||||
// Clear sets all bits of the given capabilities kind to zero. The
|
|
||||||
// 'kind' value should be one or combination (OR'ed) of CAPS,
|
|
||||||
// BOUNDS or AMBS.
|
|
||||||
Clear(kind CapType)
|
|
||||||
|
|
||||||
// String return current capabilities state of the given capabilities
|
|
||||||
// set as string. The 'which' value should be one of EFFECTIVE,
|
|
||||||
// PERMITTED, INHERITABLE BOUNDING or AMBIENT
|
|
||||||
StringCap(which CapType) string
|
|
||||||
|
|
||||||
// String return current capabilities state as string.
|
|
||||||
String() string
|
|
||||||
|
|
||||||
// Load load actual capabilities value. This will overwrite all
|
|
||||||
// outstanding changes.
|
|
||||||
Load() error
|
|
||||||
|
|
||||||
// Apply apply the capabilities settings, so all changes will take
|
|
||||||
// effect.
|
|
||||||
Apply(kind CapType) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewPid initializes a new Capabilities object for given pid when
|
|
||||||
// it is nonzero, or for the current process if pid is 0.
|
|
||||||
//
|
|
||||||
// Deprecated: Replace with NewPid2. For example, replace:
|
|
||||||
//
|
|
||||||
// c, err := NewPid(0)
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// with:
|
|
||||||
//
|
|
||||||
// c, err := NewPid2(0)
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
// err = c.Load()
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
func NewPid(pid int) (Capabilities, error) {
|
|
||||||
c, err := newPid(pid)
|
|
||||||
if err != nil {
|
|
||||||
return c, err
|
|
||||||
}
|
|
||||||
err = c.Load()
|
|
||||||
return c, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewPid2 initializes a new Capabilities object for given pid when
|
|
||||||
// it is nonzero, or for the current process if pid is 0. This
|
|
||||||
// does not load the process's current capabilities; to do that you
|
|
||||||
// must call Load explicitly.
|
|
||||||
func NewPid2(pid int) (Capabilities, error) {
|
|
||||||
return newPid(pid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewFile initializes a new Capabilities object for given file path.
|
|
||||||
//
|
|
||||||
// Deprecated: Replace with NewFile2. For example, replace:
|
|
||||||
//
|
|
||||||
// c, err := NewFile(path)
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// with:
|
|
||||||
//
|
|
||||||
// c, err := NewFile2(path)
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
// err = c.Load()
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
func NewFile(path string) (Capabilities, error) {
|
|
||||||
c, err := newFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return c, err
|
|
||||||
}
|
|
||||||
err = c.Load()
|
|
||||||
return c, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewFile2 creates a new initialized Capabilities object for given
|
|
||||||
// file path. This does not load the process's current capabilities;
|
|
||||||
// to do that you must call Load explicitly.
|
|
||||||
func NewFile2(path string) (Capabilities, error) {
|
|
||||||
return newFile(path)
|
|
||||||
}
|
|
|
@ -1,642 +0,0 @@
|
||||||
// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
package capability
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"syscall"
|
|
||||||
)
|
|
||||||
|
|
||||||
var errUnknownVers = errors.New("unknown capability version")
|
|
||||||
|
|
||||||
const (
|
|
||||||
linuxCapVer1 = 0x19980330
|
|
||||||
linuxCapVer2 = 0x20071026
|
|
||||||
linuxCapVer3 = 0x20080522
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
capVers uint32
|
|
||||||
capLastCap Cap
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
var hdr capHeader
|
|
||||||
capget(&hdr, nil)
|
|
||||||
capVers = hdr.version
|
|
||||||
|
|
||||||
if initLastCap() == nil {
|
|
||||||
CAP_LAST_CAP = capLastCap
|
|
||||||
if capLastCap > 31 {
|
|
||||||
capUpperMask = (uint32(1) << (uint(capLastCap) - 31)) - 1
|
|
||||||
} else {
|
|
||||||
capUpperMask = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func initLastCap() error {
|
|
||||||
if capLastCap != 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
f, err := os.Open("/proc/sys/kernel/cap_last_cap")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
var b []byte = make([]byte, 11)
|
|
||||||
_, err = f.Read(b)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Sscanf(string(b), "%d", &capLastCap)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func mkStringCap(c Capabilities, which CapType) (ret string) {
|
|
||||||
for i, first := Cap(0), true; i <= CAP_LAST_CAP; i++ {
|
|
||||||
if !c.Get(which, i) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if first {
|
|
||||||
first = false
|
|
||||||
} else {
|
|
||||||
ret += ", "
|
|
||||||
}
|
|
||||||
ret += i.String()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func mkString(c Capabilities, max CapType) (ret string) {
|
|
||||||
ret = "{"
|
|
||||||
for i := CapType(1); i <= max; i <<= 1 {
|
|
||||||
ret += " " + i.String() + "=\""
|
|
||||||
if c.Empty(i) {
|
|
||||||
ret += "empty"
|
|
||||||
} else if c.Full(i) {
|
|
||||||
ret += "full"
|
|
||||||
} else {
|
|
||||||
ret += c.StringCap(i)
|
|
||||||
}
|
|
||||||
ret += "\""
|
|
||||||
}
|
|
||||||
ret += " }"
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func newPid(pid int) (c Capabilities, err error) {
|
|
||||||
switch capVers {
|
|
||||||
case linuxCapVer1:
|
|
||||||
p := new(capsV1)
|
|
||||||
p.hdr.version = capVers
|
|
||||||
p.hdr.pid = int32(pid)
|
|
||||||
c = p
|
|
||||||
case linuxCapVer2, linuxCapVer3:
|
|
||||||
p := new(capsV3)
|
|
||||||
p.hdr.version = capVers
|
|
||||||
p.hdr.pid = int32(pid)
|
|
||||||
c = p
|
|
||||||
default:
|
|
||||||
err = errUnknownVers
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
type capsV1 struct {
|
|
||||||
hdr capHeader
|
|
||||||
data capData
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Get(which CapType, what Cap) bool {
|
|
||||||
if what > 32 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
switch which {
|
|
||||||
case EFFECTIVE:
|
|
||||||
return (1<<uint(what))&c.data.effective != 0
|
|
||||||
case PERMITTED:
|
|
||||||
return (1<<uint(what))&c.data.permitted != 0
|
|
||||||
case INHERITABLE:
|
|
||||||
return (1<<uint(what))&c.data.inheritable != 0
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) getData(which CapType) (ret uint32) {
|
|
||||||
switch which {
|
|
||||||
case EFFECTIVE:
|
|
||||||
ret = c.data.effective
|
|
||||||
case PERMITTED:
|
|
||||||
ret = c.data.permitted
|
|
||||||
case INHERITABLE:
|
|
||||||
ret = c.data.inheritable
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Empty(which CapType) bool {
|
|
||||||
return c.getData(which) == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Full(which CapType) bool {
|
|
||||||
return (c.getData(which) & 0x7fffffff) == 0x7fffffff
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Set(which CapType, caps ...Cap) {
|
|
||||||
for _, what := range caps {
|
|
||||||
if what > 32 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if which&EFFECTIVE != 0 {
|
|
||||||
c.data.effective |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&PERMITTED != 0 {
|
|
||||||
c.data.permitted |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&INHERITABLE != 0 {
|
|
||||||
c.data.inheritable |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Unset(which CapType, caps ...Cap) {
|
|
||||||
for _, what := range caps {
|
|
||||||
if what > 32 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if which&EFFECTIVE != 0 {
|
|
||||||
c.data.effective &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&PERMITTED != 0 {
|
|
||||||
c.data.permitted &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&INHERITABLE != 0 {
|
|
||||||
c.data.inheritable &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Fill(kind CapType) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
c.data.effective = 0x7fffffff
|
|
||||||
c.data.permitted = 0x7fffffff
|
|
||||||
c.data.inheritable = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Clear(kind CapType) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
c.data.effective = 0
|
|
||||||
c.data.permitted = 0
|
|
||||||
c.data.inheritable = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) StringCap(which CapType) (ret string) {
|
|
||||||
return mkStringCap(c, which)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) String() (ret string) {
|
|
||||||
return mkString(c, BOUNDING)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Load() (err error) {
|
|
||||||
return capget(&c.hdr, &c.data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV1) Apply(kind CapType) error {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
return capset(&c.hdr, &c.data)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type capsV3 struct {
|
|
||||||
hdr capHeader
|
|
||||||
data [2]capData
|
|
||||||
bounds [2]uint32
|
|
||||||
ambient [2]uint32
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Get(which CapType, what Cap) bool {
|
|
||||||
var i uint
|
|
||||||
if what > 31 {
|
|
||||||
i = uint(what) >> 5
|
|
||||||
what %= 32
|
|
||||||
}
|
|
||||||
|
|
||||||
switch which {
|
|
||||||
case EFFECTIVE:
|
|
||||||
return (1<<uint(what))&c.data[i].effective != 0
|
|
||||||
case PERMITTED:
|
|
||||||
return (1<<uint(what))&c.data[i].permitted != 0
|
|
||||||
case INHERITABLE:
|
|
||||||
return (1<<uint(what))&c.data[i].inheritable != 0
|
|
||||||
case BOUNDING:
|
|
||||||
return (1<<uint(what))&c.bounds[i] != 0
|
|
||||||
case AMBIENT:
|
|
||||||
return (1<<uint(what))&c.ambient[i] != 0
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) getData(which CapType, dest []uint32) {
|
|
||||||
switch which {
|
|
||||||
case EFFECTIVE:
|
|
||||||
dest[0] = c.data[0].effective
|
|
||||||
dest[1] = c.data[1].effective
|
|
||||||
case PERMITTED:
|
|
||||||
dest[0] = c.data[0].permitted
|
|
||||||
dest[1] = c.data[1].permitted
|
|
||||||
case INHERITABLE:
|
|
||||||
dest[0] = c.data[0].inheritable
|
|
||||||
dest[1] = c.data[1].inheritable
|
|
||||||
case BOUNDING:
|
|
||||||
dest[0] = c.bounds[0]
|
|
||||||
dest[1] = c.bounds[1]
|
|
||||||
case AMBIENT:
|
|
||||||
dest[0] = c.ambient[0]
|
|
||||||
dest[1] = c.ambient[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Empty(which CapType) bool {
|
|
||||||
var data [2]uint32
|
|
||||||
c.getData(which, data[:])
|
|
||||||
return data[0] == 0 && data[1] == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Full(which CapType) bool {
|
|
||||||
var data [2]uint32
|
|
||||||
c.getData(which, data[:])
|
|
||||||
if (data[0] & 0xffffffff) != 0xffffffff {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return (data[1] & capUpperMask) == capUpperMask
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Set(which CapType, caps ...Cap) {
|
|
||||||
for _, what := range caps {
|
|
||||||
var i uint
|
|
||||||
if what > 31 {
|
|
||||||
i = uint(what) >> 5
|
|
||||||
what %= 32
|
|
||||||
}
|
|
||||||
|
|
||||||
if which&EFFECTIVE != 0 {
|
|
||||||
c.data[i].effective |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&PERMITTED != 0 {
|
|
||||||
c.data[i].permitted |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&INHERITABLE != 0 {
|
|
||||||
c.data[i].inheritable |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&BOUNDING != 0 {
|
|
||||||
c.bounds[i] |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&AMBIENT != 0 {
|
|
||||||
c.ambient[i] |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Unset(which CapType, caps ...Cap) {
|
|
||||||
for _, what := range caps {
|
|
||||||
var i uint
|
|
||||||
if what > 31 {
|
|
||||||
i = uint(what) >> 5
|
|
||||||
what %= 32
|
|
||||||
}
|
|
||||||
|
|
||||||
if which&EFFECTIVE != 0 {
|
|
||||||
c.data[i].effective &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&PERMITTED != 0 {
|
|
||||||
c.data[i].permitted &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&INHERITABLE != 0 {
|
|
||||||
c.data[i].inheritable &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&BOUNDING != 0 {
|
|
||||||
c.bounds[i] &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&AMBIENT != 0 {
|
|
||||||
c.ambient[i] &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Fill(kind CapType) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
c.data[0].effective = 0xffffffff
|
|
||||||
c.data[0].permitted = 0xffffffff
|
|
||||||
c.data[0].inheritable = 0
|
|
||||||
c.data[1].effective = 0xffffffff
|
|
||||||
c.data[1].permitted = 0xffffffff
|
|
||||||
c.data[1].inheritable = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
if kind&BOUNDS == BOUNDS {
|
|
||||||
c.bounds[0] = 0xffffffff
|
|
||||||
c.bounds[1] = 0xffffffff
|
|
||||||
}
|
|
||||||
if kind&AMBS == AMBS {
|
|
||||||
c.ambient[0] = 0xffffffff
|
|
||||||
c.ambient[1] = 0xffffffff
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Clear(kind CapType) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
c.data[0].effective = 0
|
|
||||||
c.data[0].permitted = 0
|
|
||||||
c.data[0].inheritable = 0
|
|
||||||
c.data[1].effective = 0
|
|
||||||
c.data[1].permitted = 0
|
|
||||||
c.data[1].inheritable = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
if kind&BOUNDS == BOUNDS {
|
|
||||||
c.bounds[0] = 0
|
|
||||||
c.bounds[1] = 0
|
|
||||||
}
|
|
||||||
if kind&AMBS == AMBS {
|
|
||||||
c.ambient[0] = 0
|
|
||||||
c.ambient[1] = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) StringCap(which CapType) (ret string) {
|
|
||||||
return mkStringCap(c, which)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) String() (ret string) {
|
|
||||||
return mkString(c, BOUNDING)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Load() (err error) {
|
|
||||||
err = capget(&c.hdr, &c.data[0])
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var status_path string
|
|
||||||
|
|
||||||
if c.hdr.pid == 0 {
|
|
||||||
status_path = fmt.Sprintf("/proc/self/status")
|
|
||||||
} else {
|
|
||||||
status_path = fmt.Sprintf("/proc/%d/status", c.hdr.pid)
|
|
||||||
}
|
|
||||||
|
|
||||||
f, err := os.Open(status_path)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
b := bufio.NewReader(f)
|
|
||||||
for {
|
|
||||||
line, e := b.ReadString('\n')
|
|
||||||
if e != nil {
|
|
||||||
if e != io.EOF {
|
|
||||||
err = e
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(line, "CapB") {
|
|
||||||
fmt.Sscanf(line[4:], "nd: %08x%08x", &c.bounds[1], &c.bounds[0])
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(line, "CapA") {
|
|
||||||
fmt.Sscanf(line[4:], "mb: %08x%08x", &c.ambient[1], &c.ambient[0])
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
f.Close()
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsV3) Apply(kind CapType) (err error) {
|
|
||||||
if kind&BOUNDS == BOUNDS {
|
|
||||||
var data [2]capData
|
|
||||||
err = capget(&c.hdr, &data[0])
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (1<<uint(CAP_SETPCAP))&data[0].effective != 0 {
|
|
||||||
for i := Cap(0); i <= CAP_LAST_CAP; i++ {
|
|
||||||
if c.Get(BOUNDING, i) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
err = prctl(syscall.PR_CAPBSET_DROP, uintptr(i), 0, 0, 0)
|
|
||||||
if err != nil {
|
|
||||||
// Ignore EINVAL since the capability may not be supported in this system.
|
|
||||||
if errno, ok := err.(syscall.Errno); ok && errno == syscall.EINVAL {
|
|
||||||
err = nil
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
err = capset(&c.hdr, &c.data[0])
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if kind&AMBS == AMBS {
|
|
||||||
for i := Cap(0); i <= CAP_LAST_CAP; i++ {
|
|
||||||
action := pr_CAP_AMBIENT_LOWER
|
|
||||||
if c.Get(AMBIENT, i) {
|
|
||||||
action = pr_CAP_AMBIENT_RAISE
|
|
||||||
}
|
|
||||||
err := prctl(pr_CAP_AMBIENT, action, uintptr(i), 0, 0)
|
|
||||||
// Ignore EINVAL as not supported on kernels before 4.3
|
|
||||||
if errno, ok := err.(syscall.Errno); ok && errno == syscall.EINVAL {
|
|
||||||
err = nil
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func newFile(path string) (c Capabilities, err error) {
|
|
||||||
c = &capsFile{path: path}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
type capsFile struct {
|
|
||||||
path string
|
|
||||||
data vfscapData
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Get(which CapType, what Cap) bool {
|
|
||||||
var i uint
|
|
||||||
if what > 31 {
|
|
||||||
if c.data.version == 1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
i = uint(what) >> 5
|
|
||||||
what %= 32
|
|
||||||
}
|
|
||||||
|
|
||||||
switch which {
|
|
||||||
case EFFECTIVE:
|
|
||||||
return (1<<uint(what))&c.data.effective[i] != 0
|
|
||||||
case PERMITTED:
|
|
||||||
return (1<<uint(what))&c.data.data[i].permitted != 0
|
|
||||||
case INHERITABLE:
|
|
||||||
return (1<<uint(what))&c.data.data[i].inheritable != 0
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) getData(which CapType, dest []uint32) {
|
|
||||||
switch which {
|
|
||||||
case EFFECTIVE:
|
|
||||||
dest[0] = c.data.effective[0]
|
|
||||||
dest[1] = c.data.effective[1]
|
|
||||||
case PERMITTED:
|
|
||||||
dest[0] = c.data.data[0].permitted
|
|
||||||
dest[1] = c.data.data[1].permitted
|
|
||||||
case INHERITABLE:
|
|
||||||
dest[0] = c.data.data[0].inheritable
|
|
||||||
dest[1] = c.data.data[1].inheritable
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Empty(which CapType) bool {
|
|
||||||
var data [2]uint32
|
|
||||||
c.getData(which, data[:])
|
|
||||||
return data[0] == 0 && data[1] == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Full(which CapType) bool {
|
|
||||||
var data [2]uint32
|
|
||||||
c.getData(which, data[:])
|
|
||||||
if c.data.version == 0 {
|
|
||||||
return (data[0] & 0x7fffffff) == 0x7fffffff
|
|
||||||
}
|
|
||||||
if (data[0] & 0xffffffff) != 0xffffffff {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return (data[1] & capUpperMask) == capUpperMask
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Set(which CapType, caps ...Cap) {
|
|
||||||
for _, what := range caps {
|
|
||||||
var i uint
|
|
||||||
if what > 31 {
|
|
||||||
if c.data.version == 1 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
i = uint(what) >> 5
|
|
||||||
what %= 32
|
|
||||||
}
|
|
||||||
|
|
||||||
if which&EFFECTIVE != 0 {
|
|
||||||
c.data.effective[i] |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&PERMITTED != 0 {
|
|
||||||
c.data.data[i].permitted |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
if which&INHERITABLE != 0 {
|
|
||||||
c.data.data[i].inheritable |= 1 << uint(what)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Unset(which CapType, caps ...Cap) {
|
|
||||||
for _, what := range caps {
|
|
||||||
var i uint
|
|
||||||
if what > 31 {
|
|
||||||
if c.data.version == 1 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
i = uint(what) >> 5
|
|
||||||
what %= 32
|
|
||||||
}
|
|
||||||
|
|
||||||
if which&EFFECTIVE != 0 {
|
|
||||||
c.data.effective[i] &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&PERMITTED != 0 {
|
|
||||||
c.data.data[i].permitted &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
if which&INHERITABLE != 0 {
|
|
||||||
c.data.data[i].inheritable &= ^(1 << uint(what))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Fill(kind CapType) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
c.data.effective[0] = 0xffffffff
|
|
||||||
c.data.data[0].permitted = 0xffffffff
|
|
||||||
c.data.data[0].inheritable = 0
|
|
||||||
if c.data.version == 2 {
|
|
||||||
c.data.effective[1] = 0xffffffff
|
|
||||||
c.data.data[1].permitted = 0xffffffff
|
|
||||||
c.data.data[1].inheritable = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Clear(kind CapType) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
c.data.effective[0] = 0
|
|
||||||
c.data.data[0].permitted = 0
|
|
||||||
c.data.data[0].inheritable = 0
|
|
||||||
if c.data.version == 2 {
|
|
||||||
c.data.effective[1] = 0
|
|
||||||
c.data.data[1].permitted = 0
|
|
||||||
c.data.data[1].inheritable = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) StringCap(which CapType) (ret string) {
|
|
||||||
return mkStringCap(c, which)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) String() (ret string) {
|
|
||||||
return mkString(c, INHERITABLE)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Load() (err error) {
|
|
||||||
return getVfsCap(c.path, &c.data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *capsFile) Apply(kind CapType) (err error) {
|
|
||||||
if kind&CAPS == CAPS {
|
|
||||||
return setVfsCap(c.path, &c.data)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
// +build !linux
|
|
||||||
|
|
||||||
package capability
|
|
||||||
|
|
||||||
import "errors"
|
|
||||||
|
|
||||||
func newPid(pid int) (Capabilities, error) {
|
|
||||||
return nil, errors.New("not supported")
|
|
||||||
}
|
|
||||||
|
|
||||||
func newFile(path string) (Capabilities, error) {
|
|
||||||
return nil, errors.New("not supported")
|
|
||||||
}
|
|
|
@ -1,268 +0,0 @@
|
||||||
// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
package capability
|
|
||||||
|
|
||||||
type CapType uint
|
|
||||||
|
|
||||||
func (c CapType) String() string {
|
|
||||||
switch c {
|
|
||||||
case EFFECTIVE:
|
|
||||||
return "effective"
|
|
||||||
case PERMITTED:
|
|
||||||
return "permitted"
|
|
||||||
case INHERITABLE:
|
|
||||||
return "inheritable"
|
|
||||||
case BOUNDING:
|
|
||||||
return "bounding"
|
|
||||||
case CAPS:
|
|
||||||
return "caps"
|
|
||||||
case AMBIENT:
|
|
||||||
return "ambient"
|
|
||||||
}
|
|
||||||
return "unknown"
|
|
||||||
}
|
|
||||||
|
|
||||||
const (
|
|
||||||
EFFECTIVE CapType = 1 << iota
|
|
||||||
PERMITTED
|
|
||||||
INHERITABLE
|
|
||||||
BOUNDING
|
|
||||||
AMBIENT
|
|
||||||
|
|
||||||
CAPS = EFFECTIVE | PERMITTED | INHERITABLE
|
|
||||||
BOUNDS = BOUNDING
|
|
||||||
AMBS = AMBIENT
|
|
||||||
)
|
|
||||||
|
|
||||||
//go:generate go run enumgen/gen.go
|
|
||||||
type Cap int
|
|
||||||
|
|
||||||
// POSIX-draft defined capabilities.
|
|
||||||
const (
|
|
||||||
// In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
|
|
||||||
// overrides the restriction of changing file ownership and group
|
|
||||||
// ownership.
|
|
||||||
CAP_CHOWN = Cap(0)
|
|
||||||
|
|
||||||
// Override all DAC access, including ACL execute access if
|
|
||||||
// [_POSIX_ACL] is defined. Excluding DAC access covered by
|
|
||||||
// CAP_LINUX_IMMUTABLE.
|
|
||||||
CAP_DAC_OVERRIDE = Cap(1)
|
|
||||||
|
|
||||||
// Overrides all DAC restrictions regarding read and search on files
|
|
||||||
// and directories, including ACL restrictions if [_POSIX_ACL] is
|
|
||||||
// defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE.
|
|
||||||
CAP_DAC_READ_SEARCH = Cap(2)
|
|
||||||
|
|
||||||
// Overrides all restrictions about allowed operations on files, where
|
|
||||||
// file owner ID must be equal to the user ID, except where CAP_FSETID
|
|
||||||
// is applicable. It doesn't override MAC and DAC restrictions.
|
|
||||||
CAP_FOWNER = Cap(3)
|
|
||||||
|
|
||||||
// Overrides the following restrictions that the effective user ID
|
|
||||||
// shall match the file owner ID when setting the S_ISUID and S_ISGID
|
|
||||||
// bits on that file; that the effective group ID (or one of the
|
|
||||||
// supplementary group IDs) shall match the file owner ID when setting
|
|
||||||
// the S_ISGID bit on that file; that the S_ISUID and S_ISGID bits are
|
|
||||||
// cleared on successful return from chown(2) (not implemented).
|
|
||||||
CAP_FSETID = Cap(4)
|
|
||||||
|
|
||||||
// Overrides the restriction that the real or effective user ID of a
|
|
||||||
// process sending a signal must match the real or effective user ID
|
|
||||||
// of the process receiving the signal.
|
|
||||||
CAP_KILL = Cap(5)
|
|
||||||
|
|
||||||
// Allows setgid(2) manipulation
|
|
||||||
// Allows setgroups(2)
|
|
||||||
// Allows forged gids on socket credentials passing.
|
|
||||||
CAP_SETGID = Cap(6)
|
|
||||||
|
|
||||||
// Allows set*uid(2) manipulation (including fsuid).
|
|
||||||
// Allows forged pids on socket credentials passing.
|
|
||||||
CAP_SETUID = Cap(7)
|
|
||||||
|
|
||||||
// Linux-specific capabilities
|
|
||||||
|
|
||||||
// Without VFS support for capabilities:
|
|
||||||
// Transfer any capability in your permitted set to any pid,
|
|
||||||
// remove any capability in your permitted set from any pid
|
|
||||||
// With VFS support for capabilities (neither of above, but)
|
|
||||||
// Add any capability from current's capability bounding set
|
|
||||||
// to the current process' inheritable set
|
|
||||||
// Allow taking bits out of capability bounding set
|
|
||||||
// Allow modification of the securebits for a process
|
|
||||||
CAP_SETPCAP = Cap(8)
|
|
||||||
|
|
||||||
// Allow modification of S_IMMUTABLE and S_APPEND file attributes
|
|
||||||
CAP_LINUX_IMMUTABLE = Cap(9)
|
|
||||||
|
|
||||||
// Allows binding to TCP/UDP sockets below 1024
|
|
||||||
// Allows binding to ATM VCIs below 32
|
|
||||||
CAP_NET_BIND_SERVICE = Cap(10)
|
|
||||||
|
|
||||||
// Allow broadcasting, listen to multicast
|
|
||||||
CAP_NET_BROADCAST = Cap(11)
|
|
||||||
|
|
||||||
// Allow interface configuration
|
|
||||||
// Allow administration of IP firewall, masquerading and accounting
|
|
||||||
// Allow setting debug option on sockets
|
|
||||||
// Allow modification of routing tables
|
|
||||||
// Allow setting arbitrary process / process group ownership on
|
|
||||||
// sockets
|
|
||||||
// Allow binding to any address for transparent proxying (also via NET_RAW)
|
|
||||||
// Allow setting TOS (type of service)
|
|
||||||
// Allow setting promiscuous mode
|
|
||||||
// Allow clearing driver statistics
|
|
||||||
// Allow multicasting
|
|
||||||
// Allow read/write of device-specific registers
|
|
||||||
// Allow activation of ATM control sockets
|
|
||||||
CAP_NET_ADMIN = Cap(12)
|
|
||||||
|
|
||||||
// Allow use of RAW sockets
|
|
||||||
// Allow use of PACKET sockets
|
|
||||||
// Allow binding to any address for transparent proxying (also via NET_ADMIN)
|
|
||||||
CAP_NET_RAW = Cap(13)
|
|
||||||
|
|
||||||
// Allow locking of shared memory segments
|
|
||||||
// Allow mlock and mlockall (which doesn't really have anything to do
|
|
||||||
// with IPC)
|
|
||||||
CAP_IPC_LOCK = Cap(14)
|
|
||||||
|
|
||||||
// Override IPC ownership checks
|
|
||||||
CAP_IPC_OWNER = Cap(15)
|
|
||||||
|
|
||||||
// Insert and remove kernel modules - modify kernel without limit
|
|
||||||
CAP_SYS_MODULE = Cap(16)
|
|
||||||
|
|
||||||
// Allow ioperm/iopl access
|
|
||||||
// Allow sending USB messages to any device via /proc/bus/usb
|
|
||||||
CAP_SYS_RAWIO = Cap(17)
|
|
||||||
|
|
||||||
// Allow use of chroot()
|
|
||||||
CAP_SYS_CHROOT = Cap(18)
|
|
||||||
|
|
||||||
// Allow ptrace() of any process
|
|
||||||
CAP_SYS_PTRACE = Cap(19)
|
|
||||||
|
|
||||||
// Allow configuration of process accounting
|
|
||||||
CAP_SYS_PACCT = Cap(20)
|
|
||||||
|
|
||||||
// Allow configuration of the secure attention key
|
|
||||||
// Allow administration of the random device
|
|
||||||
// Allow examination and configuration of disk quotas
|
|
||||||
// Allow setting the domainname
|
|
||||||
// Allow setting the hostname
|
|
||||||
// Allow calling bdflush()
|
|
||||||
// Allow mount() and umount(), setting up new smb connection
|
|
||||||
// Allow some autofs root ioctls
|
|
||||||
// Allow nfsservctl
|
|
||||||
// Allow VM86_REQUEST_IRQ
|
|
||||||
// Allow to read/write pci config on alpha
|
|
||||||
// Allow irix_prctl on mips (setstacksize)
|
|
||||||
// Allow flushing all cache on m68k (sys_cacheflush)
|
|
||||||
// Allow removing semaphores
|
|
||||||
// Used instead of CAP_CHOWN to "chown" IPC message queues, semaphores
|
|
||||||
// and shared memory
|
|
||||||
// Allow locking/unlocking of shared memory segment
|
|
||||||
// Allow turning swap on/off
|
|
||||||
// Allow forged pids on socket credentials passing
|
|
||||||
// Allow setting readahead and flushing buffers on block devices
|
|
||||||
// Allow setting geometry in floppy driver
|
|
||||||
// Allow turning DMA on/off in xd driver
|
|
||||||
// Allow administration of md devices (mostly the above, but some
|
|
||||||
// extra ioctls)
|
|
||||||
// Allow tuning the ide driver
|
|
||||||
// Allow access to the nvram device
|
|
||||||
// Allow administration of apm_bios, serial and bttv (TV) device
|
|
||||||
// Allow manufacturer commands in isdn CAPI support driver
|
|
||||||
// Allow reading non-standardized portions of pci configuration space
|
|
||||||
// Allow DDI debug ioctl on sbpcd driver
|
|
||||||
// Allow setting up serial ports
|
|
||||||
// Allow sending raw qic-117 commands
|
|
||||||
// Allow enabling/disabling tagged queuing on SCSI controllers and sending
|
|
||||||
// arbitrary SCSI commands
|
|
||||||
// Allow setting encryption key on loopback filesystem
|
|
||||||
// Allow setting zone reclaim policy
|
|
||||||
CAP_SYS_ADMIN = Cap(21)
|
|
||||||
|
|
||||||
// Allow use of reboot()
|
|
||||||
CAP_SYS_BOOT = Cap(22)
|
|
||||||
|
|
||||||
// Allow raising priority and setting priority on other (different
|
|
||||||
// UID) processes
|
|
||||||
// Allow use of FIFO and round-robin (realtime) scheduling on own
|
|
||||||
// processes and setting the scheduling algorithm used by another
|
|
||||||
// process.
|
|
||||||
// Allow setting cpu affinity on other processes
|
|
||||||
CAP_SYS_NICE = Cap(23)
|
|
||||||
|
|
||||||
// Override resource limits. Set resource limits.
|
|
||||||
// Override quota limits.
|
|
||||||
// Override reserved space on ext2 filesystem
|
|
||||||
// Modify data journaling mode on ext3 filesystem (uses journaling
|
|
||||||
// resources)
|
|
||||||
// NOTE: ext2 honors fsuid when checking for resource overrides, so
|
|
||||||
// you can override using fsuid too
|
|
||||||
// Override size restrictions on IPC message queues
|
|
||||||
// Allow more than 64hz interrupts from the real-time clock
|
|
||||||
// Override max number of consoles on console allocation
|
|
||||||
// Override max number of keymaps
|
|
||||||
CAP_SYS_RESOURCE = Cap(24)
|
|
||||||
|
|
||||||
// Allow manipulation of system clock
|
|
||||||
// Allow irix_stime on mips
|
|
||||||
// Allow setting the real-time clock
|
|
||||||
CAP_SYS_TIME = Cap(25)
|
|
||||||
|
|
||||||
// Allow configuration of tty devices
|
|
||||||
// Allow vhangup() of tty
|
|
||||||
CAP_SYS_TTY_CONFIG = Cap(26)
|
|
||||||
|
|
||||||
// Allow the privileged aspects of mknod()
|
|
||||||
CAP_MKNOD = Cap(27)
|
|
||||||
|
|
||||||
// Allow taking of leases on files
|
|
||||||
CAP_LEASE = Cap(28)
|
|
||||||
|
|
||||||
CAP_AUDIT_WRITE = Cap(29)
|
|
||||||
CAP_AUDIT_CONTROL = Cap(30)
|
|
||||||
CAP_SETFCAP = Cap(31)
|
|
||||||
|
|
||||||
// Override MAC access.
|
|
||||||
// The base kernel enforces no MAC policy.
|
|
||||||
// An LSM may enforce a MAC policy, and if it does and it chooses
|
|
||||||
// to implement capability based overrides of that policy, this is
|
|
||||||
// the capability it should use to do so.
|
|
||||||
CAP_MAC_OVERRIDE = Cap(32)
|
|
||||||
|
|
||||||
// Allow MAC configuration or state changes.
|
|
||||||
// The base kernel requires no MAC configuration.
|
|
||||||
// An LSM may enforce a MAC policy, and if it does and it chooses
|
|
||||||
// to implement capability based checks on modifications to that
|
|
||||||
// policy or the data required to maintain it, this is the
|
|
||||||
// capability it should use to do so.
|
|
||||||
CAP_MAC_ADMIN = Cap(33)
|
|
||||||
|
|
||||||
// Allow configuring the kernel's syslog (printk behaviour)
|
|
||||||
CAP_SYSLOG = Cap(34)
|
|
||||||
|
|
||||||
// Allow triggering something that will wake the system
|
|
||||||
CAP_WAKE_ALARM = Cap(35)
|
|
||||||
|
|
||||||
// Allow preventing system suspends
|
|
||||||
CAP_BLOCK_SUSPEND = Cap(36)
|
|
||||||
|
|
||||||
// Allow reading audit messages from the kernel
|
|
||||||
CAP_AUDIT_READ = Cap(37)
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// Highest valid capability of the running kernel.
|
|
||||||
CAP_LAST_CAP = Cap(63)
|
|
||||||
|
|
||||||
capUpperMask = ^uint32(0)
|
|
||||||
)
|
|
|
@ -1,129 +0,0 @@
|
||||||
// generated file; DO NOT EDIT - use go generate in directory with source
|
|
||||||
|
|
||||||
package capability
|
|
||||||
|
|
||||||
func (c Cap) String() string {
|
|
||||||
switch c {
|
|
||||||
case CAP_CHOWN:
|
|
||||||
return "chown"
|
|
||||||
case CAP_DAC_OVERRIDE:
|
|
||||||
return "dac_override"
|
|
||||||
case CAP_DAC_READ_SEARCH:
|
|
||||||
return "dac_read_search"
|
|
||||||
case CAP_FOWNER:
|
|
||||||
return "fowner"
|
|
||||||
case CAP_FSETID:
|
|
||||||
return "fsetid"
|
|
||||||
case CAP_KILL:
|
|
||||||
return "kill"
|
|
||||||
case CAP_SETGID:
|
|
||||||
return "setgid"
|
|
||||||
case CAP_SETUID:
|
|
||||||
return "setuid"
|
|
||||||
case CAP_SETPCAP:
|
|
||||||
return "setpcap"
|
|
||||||
case CAP_LINUX_IMMUTABLE:
|
|
||||||
return "linux_immutable"
|
|
||||||
case CAP_NET_BIND_SERVICE:
|
|
||||||
return "net_bind_service"
|
|
||||||
case CAP_NET_BROADCAST:
|
|
||||||
return "net_broadcast"
|
|
||||||
case CAP_NET_ADMIN:
|
|
||||||
return "net_admin"
|
|
||||||
case CAP_NET_RAW:
|
|
||||||
return "net_raw"
|
|
||||||
case CAP_IPC_LOCK:
|
|
||||||
return "ipc_lock"
|
|
||||||
case CAP_IPC_OWNER:
|
|
||||||
return "ipc_owner"
|
|
||||||
case CAP_SYS_MODULE:
|
|
||||||
return "sys_module"
|
|
||||||
case CAP_SYS_RAWIO:
|
|
||||||
return "sys_rawio"
|
|
||||||
case CAP_SYS_CHROOT:
|
|
||||||
return "sys_chroot"
|
|
||||||
case CAP_SYS_PTRACE:
|
|
||||||
return "sys_ptrace"
|
|
||||||
case CAP_SYS_PACCT:
|
|
||||||
return "sys_pacct"
|
|
||||||
case CAP_SYS_ADMIN:
|
|
||||||
return "sys_admin"
|
|
||||||
case CAP_SYS_BOOT:
|
|
||||||
return "sys_boot"
|
|
||||||
case CAP_SYS_NICE:
|
|
||||||
return "sys_nice"
|
|
||||||
case CAP_SYS_RESOURCE:
|
|
||||||
return "sys_resource"
|
|
||||||
case CAP_SYS_TIME:
|
|
||||||
return "sys_time"
|
|
||||||
case CAP_SYS_TTY_CONFIG:
|
|
||||||
return "sys_tty_config"
|
|
||||||
case CAP_MKNOD:
|
|
||||||
return "mknod"
|
|
||||||
case CAP_LEASE:
|
|
||||||
return "lease"
|
|
||||||
case CAP_AUDIT_WRITE:
|
|
||||||
return "audit_write"
|
|
||||||
case CAP_AUDIT_CONTROL:
|
|
||||||
return "audit_control"
|
|
||||||
case CAP_SETFCAP:
|
|
||||||
return "setfcap"
|
|
||||||
case CAP_MAC_OVERRIDE:
|
|
||||||
return "mac_override"
|
|
||||||
case CAP_MAC_ADMIN:
|
|
||||||
return "mac_admin"
|
|
||||||
case CAP_SYSLOG:
|
|
||||||
return "syslog"
|
|
||||||
case CAP_WAKE_ALARM:
|
|
||||||
return "wake_alarm"
|
|
||||||
case CAP_BLOCK_SUSPEND:
|
|
||||||
return "block_suspend"
|
|
||||||
case CAP_AUDIT_READ:
|
|
||||||
return "audit_read"
|
|
||||||
}
|
|
||||||
return "unknown"
|
|
||||||
}
|
|
||||||
|
|
||||||
// List returns list of all supported capabilities
|
|
||||||
func List() []Cap {
|
|
||||||
return []Cap{
|
|
||||||
CAP_CHOWN,
|
|
||||||
CAP_DAC_OVERRIDE,
|
|
||||||
CAP_DAC_READ_SEARCH,
|
|
||||||
CAP_FOWNER,
|
|
||||||
CAP_FSETID,
|
|
||||||
CAP_KILL,
|
|
||||||
CAP_SETGID,
|
|
||||||
CAP_SETUID,
|
|
||||||
CAP_SETPCAP,
|
|
||||||
CAP_LINUX_IMMUTABLE,
|
|
||||||
CAP_NET_BIND_SERVICE,
|
|
||||||
CAP_NET_BROADCAST,
|
|
||||||
CAP_NET_ADMIN,
|
|
||||||
CAP_NET_RAW,
|
|
||||||
CAP_IPC_LOCK,
|
|
||||||
CAP_IPC_OWNER,
|
|
||||||
CAP_SYS_MODULE,
|
|
||||||
CAP_SYS_RAWIO,
|
|
||||||
CAP_SYS_CHROOT,
|
|
||||||
CAP_SYS_PTRACE,
|
|
||||||
CAP_SYS_PACCT,
|
|
||||||
CAP_SYS_ADMIN,
|
|
||||||
CAP_SYS_BOOT,
|
|
||||||
CAP_SYS_NICE,
|
|
||||||
CAP_SYS_RESOURCE,
|
|
||||||
CAP_SYS_TIME,
|
|
||||||
CAP_SYS_TTY_CONFIG,
|
|
||||||
CAP_MKNOD,
|
|
||||||
CAP_LEASE,
|
|
||||||
CAP_AUDIT_WRITE,
|
|
||||||
CAP_AUDIT_CONTROL,
|
|
||||||
CAP_SETFCAP,
|
|
||||||
CAP_MAC_OVERRIDE,
|
|
||||||
CAP_MAC_ADMIN,
|
|
||||||
CAP_SYSLOG,
|
|
||||||
CAP_WAKE_ALARM,
|
|
||||||
CAP_BLOCK_SUSPEND,
|
|
||||||
CAP_AUDIT_READ,
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,154 +0,0 @@
|
||||||
// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
|
|
||||||
// All rights reserved.
|
|
||||||
//
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file.
|
|
||||||
|
|
||||||
package capability
|
|
||||||
|
|
||||||
import (
|
|
||||||
"syscall"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
type capHeader struct {
|
|
||||||
version uint32
|
|
||||||
pid int32
|
|
||||||
}
|
|
||||||
|
|
||||||
type capData struct {
|
|
||||||
effective uint32
|
|
||||||
permitted uint32
|
|
||||||
inheritable uint32
|
|
||||||
}
|
|
||||||
|
|
||||||
func capget(hdr *capHeader, data *capData) (err error) {
|
|
||||||
_, _, e1 := syscall.Syscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
|
|
||||||
if e1 != 0 {
|
|
||||||
err = e1
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func capset(hdr *capHeader, data *capData) (err error) {
|
|
||||||
_, _, e1 := syscall.Syscall(syscall.SYS_CAPSET, uintptr(unsafe.Pointer(hdr)), uintptr(unsafe.Pointer(data)), 0)
|
|
||||||
if e1 != 0 {
|
|
||||||
err = e1
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// not yet in syscall
|
|
||||||
const (
|
|
||||||
pr_CAP_AMBIENT = 47
|
|
||||||
pr_CAP_AMBIENT_IS_SET = uintptr(1)
|
|
||||||
pr_CAP_AMBIENT_RAISE = uintptr(2)
|
|
||||||
pr_CAP_AMBIENT_LOWER = uintptr(3)
|
|
||||||
pr_CAP_AMBIENT_CLEAR_ALL = uintptr(4)
|
|
||||||
)
|
|
||||||
|
|
||||||
func prctl(option int, arg2, arg3, arg4, arg5 uintptr) (err error) {
|
|
||||||
_, _, e1 := syscall.Syscall6(syscall.SYS_PRCTL, uintptr(option), arg2, arg3, arg4, arg5, 0)
|
|
||||||
if e1 != 0 {
|
|
||||||
err = e1
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const (
|
|
||||||
vfsXattrName = "security.capability"
|
|
||||||
|
|
||||||
vfsCapVerMask = 0xff000000
|
|
||||||
vfsCapVer1 = 0x01000000
|
|
||||||
vfsCapVer2 = 0x02000000
|
|
||||||
|
|
||||||
vfsCapFlagMask = ^vfsCapVerMask
|
|
||||||
vfsCapFlageffective = 0x000001
|
|
||||||
|
|
||||||
vfscapDataSizeV1 = 4 * (1 + 2*1)
|
|
||||||
vfscapDataSizeV2 = 4 * (1 + 2*2)
|
|
||||||
)
|
|
||||||
|
|
||||||
type vfscapData struct {
|
|
||||||
magic uint32
|
|
||||||
data [2]struct {
|
|
||||||
permitted uint32
|
|
||||||
inheritable uint32
|
|
||||||
}
|
|
||||||
effective [2]uint32
|
|
||||||
version int8
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
_vfsXattrName *byte
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
_vfsXattrName, _ = syscall.BytePtrFromString(vfsXattrName)
|
|
||||||
}
|
|
||||||
|
|
||||||
func getVfsCap(path string, dest *vfscapData) (err error) {
|
|
||||||
var _p0 *byte
|
|
||||||
_p0, err = syscall.BytePtrFromString(path)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(dest)), vfscapDataSizeV2, 0, 0)
|
|
||||||
if e1 != 0 {
|
|
||||||
if e1 == syscall.ENODATA {
|
|
||||||
dest.version = 2
|
|
||||||
return
|
|
||||||
}
|
|
||||||
err = e1
|
|
||||||
}
|
|
||||||
switch dest.magic & vfsCapVerMask {
|
|
||||||
case vfsCapVer1:
|
|
||||||
dest.version = 1
|
|
||||||
if r0 != vfscapDataSizeV1 {
|
|
||||||
return syscall.EINVAL
|
|
||||||
}
|
|
||||||
dest.data[1].permitted = 0
|
|
||||||
dest.data[1].inheritable = 0
|
|
||||||
case vfsCapVer2:
|
|
||||||
dest.version = 2
|
|
||||||
if r0 != vfscapDataSizeV2 {
|
|
||||||
return syscall.EINVAL
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
return syscall.EINVAL
|
|
||||||
}
|
|
||||||
if dest.magic&vfsCapFlageffective != 0 {
|
|
||||||
dest.effective[0] = dest.data[0].permitted | dest.data[0].inheritable
|
|
||||||
dest.effective[1] = dest.data[1].permitted | dest.data[1].inheritable
|
|
||||||
} else {
|
|
||||||
dest.effective[0] = 0
|
|
||||||
dest.effective[1] = 0
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func setVfsCap(path string, data *vfscapData) (err error) {
|
|
||||||
var _p0 *byte
|
|
||||||
_p0, err = syscall.BytePtrFromString(path)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var size uintptr
|
|
||||||
if data.version == 1 {
|
|
||||||
data.magic = vfsCapVer1
|
|
||||||
size = vfscapDataSizeV1
|
|
||||||
} else if data.version == 2 {
|
|
||||||
data.magic = vfsCapVer2
|
|
||||||
if data.effective[0] != 0 || data.effective[1] != 0 {
|
|
||||||
data.magic |= vfsCapFlageffective
|
|
||||||
}
|
|
||||||
size = vfscapDataSizeV2
|
|
||||||
} else {
|
|
||||||
return syscall.EINVAL
|
|
||||||
}
|
|
||||||
_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(data)), size, 0, 0)
|
|
||||||
if e1 != 0 {
|
|
||||||
err = e1
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
|
@ -1,127 +0,0 @@
|
||||||
// Copyright 2017 The Go Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style
|
|
||||||
// license that can be found in the LICENSE file.
|
|
||||||
|
|
||||||
// Package semaphore provides a weighted semaphore implementation.
|
|
||||||
package semaphore // import "golang.org/x/sync/semaphore"
|
|
||||||
|
|
||||||
import (
|
|
||||||
"container/list"
|
|
||||||
"context"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
type waiter struct {
|
|
||||||
n int64
|
|
||||||
ready chan<- struct{} // Closed when semaphore acquired.
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewWeighted creates a new weighted semaphore with the given
|
|
||||||
// maximum combined weight for concurrent access.
|
|
||||||
func NewWeighted(n int64) *Weighted {
|
|
||||||
w := &Weighted{size: n}
|
|
||||||
return w
|
|
||||||
}
|
|
||||||
|
|
||||||
// Weighted provides a way to bound concurrent access to a resource.
|
|
||||||
// The callers can request access with a given weight.
|
|
||||||
type Weighted struct {
|
|
||||||
size int64
|
|
||||||
cur int64
|
|
||||||
mu sync.Mutex
|
|
||||||
waiters list.List
|
|
||||||
}
|
|
||||||
|
|
||||||
// Acquire acquires the semaphore with a weight of n, blocking until resources
|
|
||||||
// are available or ctx is done. On success, returns nil. On failure, returns
|
|
||||||
// ctx.Err() and leaves the semaphore unchanged.
|
|
||||||
//
|
|
||||||
// If ctx is already done, Acquire may still succeed without blocking.
|
|
||||||
func (s *Weighted) Acquire(ctx context.Context, n int64) error {
|
|
||||||
s.mu.Lock()
|
|
||||||
if s.size-s.cur >= n && s.waiters.Len() == 0 {
|
|
||||||
s.cur += n
|
|
||||||
s.mu.Unlock()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if n > s.size {
|
|
||||||
// Don't make other Acquire calls block on one that's doomed to fail.
|
|
||||||
s.mu.Unlock()
|
|
||||||
<-ctx.Done()
|
|
||||||
return ctx.Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
ready := make(chan struct{})
|
|
||||||
w := waiter{n: n, ready: ready}
|
|
||||||
elem := s.waiters.PushBack(w)
|
|
||||||
s.mu.Unlock()
|
|
||||||
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
err := ctx.Err()
|
|
||||||
s.mu.Lock()
|
|
||||||
select {
|
|
||||||
case <-ready:
|
|
||||||
// Acquired the semaphore after we were canceled. Rather than trying to
|
|
||||||
// fix up the queue, just pretend we didn't notice the cancelation.
|
|
||||||
err = nil
|
|
||||||
default:
|
|
||||||
s.waiters.Remove(elem)
|
|
||||||
}
|
|
||||||
s.mu.Unlock()
|
|
||||||
return err
|
|
||||||
|
|
||||||
case <-ready:
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TryAcquire acquires the semaphore with a weight of n without blocking.
|
|
||||||
// On success, returns true. On failure, returns false and leaves the semaphore unchanged.
|
|
||||||
func (s *Weighted) TryAcquire(n int64) bool {
|
|
||||||
s.mu.Lock()
|
|
||||||
success := s.size-s.cur >= n && s.waiters.Len() == 0
|
|
||||||
if success {
|
|
||||||
s.cur += n
|
|
||||||
}
|
|
||||||
s.mu.Unlock()
|
|
||||||
return success
|
|
||||||
}
|
|
||||||
|
|
||||||
// Release releases the semaphore with a weight of n.
|
|
||||||
func (s *Weighted) Release(n int64) {
|
|
||||||
s.mu.Lock()
|
|
||||||
s.cur -= n
|
|
||||||
if s.cur < 0 {
|
|
||||||
s.mu.Unlock()
|
|
||||||
panic("semaphore: bad release")
|
|
||||||
}
|
|
||||||
for {
|
|
||||||
next := s.waiters.Front()
|
|
||||||
if next == nil {
|
|
||||||
break // No more waiters blocked.
|
|
||||||
}
|
|
||||||
|
|
||||||
w := next.Value.(waiter)
|
|
||||||
if s.size-s.cur < w.n {
|
|
||||||
// Not enough tokens for the next waiter. We could keep going (to try to
|
|
||||||
// find a waiter with a smaller request), but under load that could cause
|
|
||||||
// starvation for large requests; instead, we leave all remaining waiters
|
|
||||||
// blocked.
|
|
||||||
//
|
|
||||||
// Consider a semaphore used as a read-write lock, with N tokens, N
|
|
||||||
// readers, and one writer. Each reader can Acquire(1) to obtain a read
|
|
||||||
// lock. The writer can Acquire(N) to obtain a write lock, excluding all
|
|
||||||
// of the readers. If we allow the readers to jump ahead in the queue,
|
|
||||||
// the writer will starve — there is always one token available for every
|
|
||||||
// reader.
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
s.cur += w.n
|
|
||||||
s.waiters.Remove(next)
|
|
||||||
close(w.ready)
|
|
||||||
}
|
|
||||||
s.mu.Unlock()
|
|
||||||
}
|
|
Loading…
Reference in New Issue