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

Update dependencies

Author: kylos101

.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 {