Merge pull request #55 from gitpod-io/aledbf/update

Update dependencies

.github/workflows/build.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17.5'
+          go-version: '1.19'
       - name: Download all Go modules
         run: |
           go mod download
@@ -33,7 +33,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17.5'
+          go-version: '1.19'
       - name: Restore go build cache
         uses: actions/cache@v1
         with:
@@ -52,11 +52,10 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17.5'
+          go-version: '1.19'
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3.1.0
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45.2
           args: --timeout 5m
 
   test-go:
@@ -77,7 +76,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17.5'
+          go-version: '1.19'
       - name: Restore go build cache
         uses: actions/cache@v1
         with:
@@ -90,12 +89,12 @@ jobs:
         run: pushd pkg/test/runner; ./build.sh; popd
       - name: Install the latest buildkit release
         run: |
-          curl -sSL "https://github.com/moby/buildkit/releases/download/v0.10.1/buildkit-v0.10.1.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local
+          curl -sSL "https://github.com/moby/buildkit/releases/download/v0.10.4/buildkit-v0.10.4.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local
       - name: Start buildkit daemon
         run: |
           sudo --non-interactive --shell <<END_SUDO
             install -d -m 0750 -o root -g docker /run/buildkit
-            buildkitd --oci-worker-snapshotter=stargz &
+            buildkitd &
             while ! test -S /run/buildkit/buildkitd.sock; do sleep 0.1; done
             chgrp docker /run/buildkit/buildkitd.sock
           END_SUDO
@@ -121,7 +120,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17.5'
+          go-version: '1.19'
       - name: Restore go build cache
         uses: actions/cache@v1
         with:

.github/workflows/release.yaml

@@ -18,7 +18,7 @@ jobs:
         name: Setup Golang
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17.5'
+          go-version: '1.19'
       -
         name: Docker Login
         uses: docker/login-action@v1

.gitpod.Dockerfile

@@ -4,7 +4,7 @@ USER root
 ENV TRIGGER_REBUILD=1
 RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | sudo tee /etc/apt/sources.list.d/goreleaser.list \
     && install-packages goreleaser -y
-RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.10.1/buildkit-v0.10.1.linux-amd64.tar.gz | tar xvz"
+RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.10.4/buildkit-v0.10.4.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
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM moby/buildkit:v0.10.1
+FROM moby/buildkit:v0.10.4
 WORKDIR /dazzle
 COPY dazzle README.md /dazzle/
 ENV PATH=/dazzle:$PATH

cmd/core/build.go

@@ -23,9 +23,10 @@ package core
 import (
 	"context"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/moby/buildkit/client"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 // buildCmd represents the build command

cmd/core/combine.go

@@ -26,10 +26,11 @@ import (
 	"strings"
 
 	"github.com/docker/distribution/reference"
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/moby/buildkit/client"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 // combineCmd represents the build command

cmd/core/project-add-combination.go

@@ -24,8 +24,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectAddCombinationCmd = &cobra.Command{

cmd/core/project-hash.go

@@ -25,8 +25,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectHashCmd = &cobra.Command{

cmd/core/project-ignore.go

@@ -24,8 +24,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectIgnoreCmd = &cobra.Command{

cmd/core/project-image-name.go

@@ -24,8 +24,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectImageNameOpts struct {

cmd/core/project-init.go

@@ -22,12 +22,12 @@ package core
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 // projectInitCmd represents the version command
@@ -42,7 +42,7 @@ var projectInitCmd = &cobra.Command{
 			if err != nil {
 				return
 			}
-			err = ioutil.WriteFile(filepath.Join("chunks", chk, "Dockerfile"), []byte("ARG base\nFROM ${base}\n\n"), 0755)
+			err = os.WriteFile(filepath.Join("chunks", chk, "Dockerfile"), []byte("ARG base\nFROM ${base}\n\n"), 0755)
 			if err != nil {
 				return
 			}
@@ -51,7 +51,7 @@ var projectInitCmd = &cobra.Command{
 			if err != nil && !os.IsExist(err) {
 				return
 			}
-			err = ioutil.WriteFile(fmt.Sprintf("tests/%s.yaml", chk), []byte("- desc: \"it should say hello\"\n  command: [\"echo\", \"hello\"]\n  assert:\n  - status == 0\n  - stdout.indexOf(\"hello\") != -1\n  - stderr.length == 0"), 0755)
+			err = os.WriteFile(fmt.Sprintf("tests/%s.yaml", chk), []byte("- desc: \"it should say hello\"\n  command: [\"echo\", \"hello\"]\n  assert:\n  - status == 0\n  - stdout.indexOf(\"hello\") != -1\n  - stderr.length == 0"), 0755)
 			if err != nil {
 				return
 			}
@@ -62,7 +62,7 @@ var projectInitCmd = &cobra.Command{
 		if err != nil {
 			return
 		}
-		err = ioutil.WriteFile("base/Dockerfile", []byte("FROM ubuntu:latest\n"), 0755)
+		err = os.WriteFile("base/Dockerfile", []byte("FROM ubuntu:latest\n"), 0755)
 		if err != nil {
 			return
 		}

cmd/core/project-manifest.go

@@ -25,8 +25,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 )
 
 var projectManifestCmd = &cobra.Command{

cmd/core/root.go

@@ -27,9 +27,10 @@ import (
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
 	"github.com/docker/cli/cli/config"
-	"github.com/gitpod-io/dazzle/pkg/fancylog"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+
+	"github.com/gitpod-io/dazzle/pkg/fancylog"
 )
 
 var rootCfg struct {

cmd/util/test-add.go

@@ -25,15 +25,14 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
 	"github.com/gookit/color"
 	"github.com/manifoldco/promptui"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/gitpod-io/dazzle/pkg/fancylog"
 	"github.com/gitpod-io/dazzle/pkg/test"
@@ -47,7 +46,7 @@ var testAddCmd = &cobra.Command{
 		log.SetFormatter(&fancylog.Formatter{})
 
 		fn := args[0]
-		fc, err := ioutil.ReadFile(fn)
+		fc, err := os.ReadFile(fn)
 		if err != nil && !os.IsNotExist(err) {
 			log.Fatal(err)
 		}
@@ -129,7 +128,7 @@ var testAddCmd = &cobra.Command{
 		}
 		fmt.Println(string(fc))
 
-		err = ioutil.WriteFile(args[0], fc, 0644)
+		err = os.WriteFile(args[0], fc, 0644)
 		if err != nil {
 			log.Fatal(err)
 		}

cmd/util/test-run.go

@@ -23,12 +23,11 @@ package util
 import (
 	"context"
 	"encoding/xml"
-	"io/ioutil"
 	"os"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/gitpod-io/dazzle/pkg/fancylog"
 	"github.com/gitpod-io/dazzle/pkg/test"
@@ -45,7 +44,7 @@ var testRunCmd = &cobra.Command{
 		var tests []*test.Spec
 
 		for _, fn := range testFiles {
-			fc, err := ioutil.ReadFile(fn)
+			fc, err := os.ReadFile(fn)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -68,7 +67,7 @@ var testRunCmd = &cobra.Command{
 				log.Fatal(err)
 			}
 
-			err = ioutil.WriteFile(xmlout, fc, 0644)
+			err = os.WriteFile(xmlout, fc, 0644)
 			if err != nil {
 				log.Fatal(err)
 			}

go.mod

@@ -1,41 +1,40 @@
 module github.com/gitpod-io/dazzle
 
-go 1.17
+go 1.19
 
 require (
 	github.com/GeertJohan/go.rice v1.0.2
 	github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
-	github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae
+	github.com/alecthomas/repr v0.1.0
 	github.com/bmatcuk/doublestar v1.3.4
 	github.com/containerd/console v1.0.3
-	github.com/containerd/containerd v1.6.3-0.20220401172941-5ff8fce1fcc6
-	github.com/creack/pty v1.1.17
-	github.com/docker/cli v20.10.13+incompatible
+	github.com/containerd/containerd v1.6.8
+	github.com/creack/pty v1.1.18
+	github.com/docker/cli v20.10.17+incompatible
 	github.com/docker/distribution v2.8.1+incompatible
-	github.com/google/go-cmp v0.5.7
-	github.com/gookit/color v1.5.0
+	github.com/google/go-cmp v0.5.8
+	github.com/gookit/color v1.5.1
 	github.com/manifoldco/promptui v0.9.0
-	github.com/mattn/go-isatty v0.0.14
+	github.com/mattn/go-isatty v0.0.16
 	github.com/minio/highwayhash v1.0.2
-	github.com/moby/buildkit v0.10.1
+	github.com/moby/buildkit v0.10.4
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
 	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.4.0
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	gopkg.in/yaml.v2 v2.4.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.5.0
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	cloud.google.com/go v0.81.0 // indirect
-	github.com/Microsoft/go-winio v0.5.1 // indirect
+	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
-	github.com/containerd/continuity v0.2.3-0.20220330195504-d132b287edc8 // indirect
+	github.com/containerd/continuity v0.3.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 v20.10.17+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/go-logr/logr v1.2.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -48,14 +47,13 @@ require (
 	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.15.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/klauspost/compress v1.15.7 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/sys/signal v0.6.0 // 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-20220115021204-b19f7f9cb274 // indirect
+	github.com/tonistiigi/fsutil v0.0.0-20220510150904-0dbf3a8a7d58 // 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
@@ -65,21 +63,15 @@ require (
 	go.opentelemetry.io/otel/sdk v1.4.1 // indirect
 	go.opentelemetry.io/otel/trace v1.4.1 // indirect
 	go.opentelemetry.io/proto/otlp v0.12.0 // indirect
-	golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.45.0 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect
+	google.golang.org/grpc v1.47.0 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 )
 
-replace (
-	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.8.1
-	github.com/docker/docker => github.com/docker/docker v20.10.3-0.20211208011758-87521affb077+incompatible // master (v21.xx-dev)
-	github.com/tonistiigi/fsutil => github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274
-
-)
+replace github.com/tonistiigi/fsutil => github.com/jetpack-io/fsutil v0.1.2