Skip to content

Commit

Permalink
Revert buildkit version
Browse files Browse the repository at this point in the history
Signed-off-by: Alvise <vitalvise@gmail.com>
  • Loading branch information
Alvise88 committed Jul 5, 2021
1 parent e359e8e commit 498fae3
Show file tree
Hide file tree
Showing 5 changed files with 499 additions and 282 deletions.
8 changes: 4 additions & 4 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"strings"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup"

"github.com/rs/zerolog/log"
Expand Down Expand Up @@ -52,9 +51,10 @@ func New(ctx context.Context, host string, noCache bool) (*Client, error) {
}
opts := []bk.ClientOpt{}

if span := trace.SpanFromContext(ctx); span != nil {
opts = append(opts, bk.WithTracerProvider(span.TracerProvider()))
}
// FIXME: uncomment when next version of buildkit will be released
// if span := trace.SpanFromContext(ctx); span != nil {
// opts = append(opts, bk.WithTracerProvider(span.TracerProvider()))
// }

c, err := bk.New(ctx, host, opts...)
if err != nil {
Expand Down
11 changes: 1 addition & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,20 @@ go 1.16
require (
cuelang.org/go v0.4.0
filippo.io/age v1.0.0-rc.3
github.com/Azure/azure-sdk-for-go v42.3.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 // indirect
github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db
github.com/containerd/console v1.0.2
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f // indirect
github.com/emicklei/proto v1.9.0 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
github.com/hashicorp/go-version v1.3.0
github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
github.com/mitchellh/go-homedir v1.1.0
github.com/moby/buildkit v0.8.2-0.20210702052944-9cf28dcf2640
github.com/moby/buildkit v0.8.3
github.com/morikuni/aec v1.0.0
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/rs/zerolog v1.23.0
github.com/smartystreets/assertions v1.0.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.7.0
Expand All @@ -42,7 +34,6 @@ require (
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
google.golang.org/grpc v1.39.0
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

Expand Down

0 comments on commit 498fae3

Please sign in to comment.