Skip to content

Commit 3123459

Browse files
committed
Update go and buildkit dependencies
1 parent 1d5bb4f commit 3123459

File tree

4 files changed

+262
-70
lines changed

4 files changed

+262
-70
lines changed

.gitpod.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM gitpod/workspace-full
22
ENV TRIGGER_REBUILD=1
33
RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sudo BINDIR=/usr/local/bin sh
4-
RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.8.3/buildkit-v0.8.3.linux-amd64.tar.gz | tar xvz"
4+
RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.9.3/buildkit-v0.9.3.linux-amd64.tar.gz | tar xvz"
55
# NOTE: remove when workspace-full includes golangci
6-
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo BINDIR=/usr/local/bin sh
6+
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo BINDIR=/usr/local/bin sh

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM moby/buildkit:v0.9.1
1+
FROM moby/buildkit:v0.9.3
22
WORKDIR /dazzle
33
COPY dazzle README.md /dazzle/
44
ENV PATH=/dazzle:$PATH
5-
ENTRYPOINT [ "/dazzle/dazzle" ]
5+
ENTRYPOINT [ "/dazzle/dazzle" ]

go.mod

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,74 @@
11
module github.com/gitpod-io/dazzle
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/GeertJohan/go.rice v1.0.2
7-
github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc
8-
github.com/alecthomas/repr v0.0.0-20210301060118-828286944d6a
7+
github.com/alecthomas/jsonschema v0.0.0-20211209230136-e2b41affa5c1
8+
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142
99
github.com/bmatcuk/doublestar v1.3.4
10-
github.com/containerd/console v1.0.2
10+
github.com/containerd/console v1.0.3
1111
github.com/containerd/containerd v1.5.8
12-
github.com/creack/pty v1.1.13
13-
github.com/docker/cli v20.10.7+incompatible
12+
github.com/creack/pty v1.1.17
13+
github.com/docker/cli v20.10.12+incompatible
1414
github.com/docker/distribution v2.7.1+incompatible
15-
github.com/google/go-cmp v0.5.5
16-
github.com/gookit/color v1.4.2
17-
github.com/manifoldco/promptui v0.8.0
18-
github.com/mattn/go-isatty v0.0.13
15+
github.com/google/go-cmp v0.5.6
16+
github.com/gookit/color v1.5.0
17+
github.com/manifoldco/promptui v0.9.0
18+
github.com/mattn/go-isatty v0.0.12
1919
github.com/minio/highwayhash v1.0.2
20-
github.com/moby/buildkit v0.8.3
20+
github.com/moby/buildkit v0.9.3
2121
github.com/opencontainers/go-digest v1.0.0
2222
github.com/opencontainers/image-spec v1.0.1
23-
github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
24-
github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
23+
github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
24+
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
2525
github.com/sirupsen/logrus v1.8.1
26-
github.com/spf13/cobra v1.1.3
26+
github.com/spf13/cobra v1.0.0
2727
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
28-
gopkg.in/sourcemap.v1 v1.0.5 // indirect
2928
gopkg.in/yaml.v2 v2.4.0
3029
)
3130

32-
replace (
33-
// protobuf: corresponds to containerd
34-
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
35-
github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
36-
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
37-
// genproto: corresponds to containerd
38-
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
39-
// grpc: corresponds to protobuf
40-
google.golang.org/grpc => google.golang.org/grpc v1.30.0
31+
require (
32+
github.com/Microsoft/go-winio v0.4.17 // indirect
33+
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
34+
github.com/containerd/continuity v0.1.0 // indirect
35+
github.com/containerd/typeurl v1.0.2 // indirect
36+
github.com/daaku/go.zipexe v1.0.0 // indirect
37+
github.com/docker/docker v20.10.7+incompatible // indirect
38+
github.com/docker/docker-credential-helpers v0.6.3 // indirect
39+
github.com/gofrs/flock v0.7.3 // indirect
40+
github.com/gogo/googleapis v1.4.0 // indirect
41+
github.com/gogo/protobuf v1.3.2 // indirect
42+
github.com/golang/protobuf v1.5.2 // indirect
43+
github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70 // indirect
44+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
45+
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
46+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
47+
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
48+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
49+
github.com/klauspost/compress v1.12.3 // indirect
50+
github.com/moby/locker v1.0.1 // indirect
51+
github.com/morikuni/aec v1.0.0 // indirect
52+
github.com/pkg/errors v0.9.1 // indirect
53+
github.com/spf13/pflag v1.0.5 // indirect
54+
github.com/tonistiigi/fsutil v0.0.0-20210609172227-d72af97c0eaf // indirect
55+
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
56+
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
57+
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
58+
go.opentelemetry.io/contrib v0.21.0 // indirect
59+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0 // indirect
60+
go.opentelemetry.io/otel v1.0.0-RC1 // indirect
61+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC1 // indirect
62+
go.opentelemetry.io/otel/sdk v1.0.0-RC1 // indirect
63+
go.opentelemetry.io/otel/trace v1.0.0-RC1 // indirect
64+
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
65+
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
66+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
67+
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect
68+
golang.org/x/text v0.3.4 // indirect
69+
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
70+
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
71+
google.golang.org/grpc v1.38.0 // indirect
72+
google.golang.org/protobuf v1.27.1 // indirect
73+
gopkg.in/sourcemap.v1 v1.0.5 // indirect
4174
)

0 commit comments

Comments
 (0)