JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: remove duplicate imports 

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
master
Koichi Shiraishi 2021-07-25 13:23:34 +09:00
parent 6034f46c3e
commit 14a1d6e543
No known key found for this signature in database
GPG Key ID: A71DFD3B4DA7A79B
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cache/remotecache/registry/registry.go vendored
View File

@ -13,7 +13,6 @@ import (
"github.com/moby/buildkit/util/resolver"
"github.com/moby/buildkit/util/resolver/limited"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
specs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
)
@ -94,11 +93,11 @@ func (dsl *withDistributionSourceLabel) SetDistributionSourceLabel(ctx context.C
if err != nil {
return err
}
_, err = hf(ctx, ocispec.Descriptor{Digest: dgst})
_, err = hf(ctx, specs.Descriptor{Digest: dgst})
return err
}
func (dsl *withDistributionSourceLabel) SetDistributionSourceAnnotation(desc ocispec.Descriptor) ocispec.Descriptor {
func (dsl *withDistributionSourceLabel) SetDistributionSourceAnnotation(desc specs.Descriptor) specs.Descriptor {
if desc.Annotations == nil {
desc.Annotations = map[string]string{}
}

3
cmd/buildkitd/main.go
View File

@ -66,7 +66,6 @@ import (
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/trace"
tracev1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
v1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
)
@ -805,5 +804,5 @@ func (t *traceCollector) Export(ctx context.Context, req *tracev1.ExportTraceSer
if err != nil {
return nil, err
}
return &v1.ExportTraceServiceResponse{}, nil
return &tracev1.ExportTraceServiceResponse{}, nil
}

3
control/control.go
View File

@ -27,7 +27,6 @@ import (
"github.com/pkg/errors"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
tracev1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
v1 "go.opentelemetry.io/proto/otlp/collector/trace/v1"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@ -203,7 +202,7 @@ func (c *Controller) Export(ctx context.Context, req *tracev1.ExportTraceService
if err != nil {
return nil, err
}
return &v1.ExportTraceServiceResponse{}, nil
return &tracev1.ExportTraceServiceResponse{}, nil
}
func translateLegacySolveRequest(req *controlapi.SolveRequest) error {