Merge pull request #35 from aledbf/aledbf/deps

Update go and buildkit dependencies

Author: aledbf

.github/workflows/build.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v1
         with:
-          go-version: '1.17.2'
+          go-version: '1.17.5'
       - name: Download all Go modules
         run: |
           go mod download
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v1
         with:
-          go-version: '1.17.2'
+          go-version: '1.17.5'
       - name: Restore go build cache
         uses: actions/cache@v1
         with:
@@ -70,16 +70,12 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - name: Create checkout directory
-        run: mkdir -p ~/go/src/github.com/gitpod-io
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Create symlink in GOPATH
-        run: ln -s $(pwd) ~/go/src/github.com/gitpod-io/dazzle
       - name: Setup Golang
         uses: actions/setup-go@v1
         with:
-          go-version: '1.17.2'
+          go-version: '1.17.5'
       - name: Restore go build cache
         uses: actions/cache@v1
         with:
@@ -120,16 +116,12 @@ jobs:
     needs:
       - build-go
     steps:
-      - name: Create checkout directory
-        run: mkdir -p ~/go/src/github.com/gitpod-io
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Create symlink in GOPATH
-        run: ln -s $(pwd) ~/go/src/github.com/gitpod-io/dazzle
       - name: Setup Golang
         uses: actions/setup-go@v1
         with:
-          go-version: '1.17.2'
+          go-version: '1.17.5'
       - name: Restore go build cache
         uses: actions/cache@v1
         with:

.gitpod.Dockerfile

@@ -1,6 +1,6 @@
 FROM gitpod/workspace-full
 ENV TRIGGER_REBUILD=1
 RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sudo BINDIR=/usr/local/bin sh
-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"
+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"
 # NOTE: remove when workspace-full includes golangci
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo BINDIR=/usr/local/bin sh
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo BINDIR=/usr/local/bin sh

Dockerfile

@@ -1,5 +1,5 @@
-FROM moby/buildkit:v0.9.1
+FROM moby/buildkit:v0.9.3
 WORKDIR /dazzle
 COPY dazzle README.md /dazzle/
 ENV PATH=/dazzle:$PATH
-ENTRYPOINT [ "/dazzle/dazzle" ]
+ENTRYPOINT [ "/dazzle/dazzle" ]

go.mod

@@ -1,41 +1,74 @@
 module github.com/gitpod-io/dazzle
 
-go 1.16
+go 1.17
 
 require (
 	github.com/GeertJohan/go.rice v1.0.2
-	github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc
-	github.com/alecthomas/repr v0.0.0-20210301060118-828286944d6a
+	github.com/alecthomas/jsonschema v0.0.0-20211209230136-e2b41affa5c1
+	github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142
 	github.com/bmatcuk/doublestar v1.3.4
-	github.com/containerd/console v1.0.2
+	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd v1.5.8
-	github.com/creack/pty v1.1.13
-	github.com/docker/cli v20.10.7+incompatible
+	github.com/creack/pty v1.1.17
+	github.com/docker/cli v20.10.12+incompatible
 	github.com/docker/distribution v2.7.1+incompatible
-	github.com/google/go-cmp v0.5.5
-	github.com/gookit/color v1.4.2
-	github.com/manifoldco/promptui v0.8.0
-	github.com/mattn/go-isatty v0.0.13
+	github.com/google/go-cmp v0.5.6
+	github.com/gookit/color v1.5.0
+	github.com/manifoldco/promptui v0.9.0
+	github.com/mattn/go-isatty v0.0.12
 	github.com/minio/highwayhash v1.0.2
-	github.com/moby/buildkit v0.8.3
+	github.com/moby/buildkit v0.9.3
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.1
-	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
-	github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
+	github.com/robertkrimen/otto v0.0.0-20211024170158-b87d35c0b86f
+	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.1.3
+	github.com/spf13/cobra v1.0.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace (
-	// protobuf: corresponds to containerd
-	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
-	github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
-	github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
-	// genproto: corresponds to containerd
-	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
-	// grpc: corresponds to protobuf
-	google.golang.org/grpc => google.golang.org/grpc v1.30.0
+require (
+	github.com/Microsoft/go-winio v0.4.17 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/containerd/continuity v0.1.0 // indirect
+	github.com/containerd/typeurl v1.0.2 // indirect
+	github.com/daaku/go.zipexe v1.0.0 // indirect
+	github.com/docker/docker v20.10.7+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.6.3 // indirect
+	github.com/gofrs/flock v0.7.3 // indirect
+	github.com/gogo/googleapis v1.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/klauspost/compress v1.12.3 // indirect
+	github.com/moby/locker v1.0.1 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tonistiigi/fsutil v0.0.0-20210609172227-d72af97c0eaf // indirect
+	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
+	github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	go.opentelemetry.io/contrib v0.21.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0 // indirect
+	go.opentelemetry.io/otel v1.0.0-RC1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC1 // indirect
+	go.opentelemetry.io/otel/sdk v1.0.0-RC1 // indirect
+	go.opentelemetry.io/otel/trace v1.0.0-RC1 // indirect
+	go.opentelemetry.io/proto/otlp v0.9.0 // indirect
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
+	golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 // indirect
+	golang.org/x/text v0.3.4 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
+	google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
+	google.golang.org/grpc v1.38.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 )