Move from csweichel to Gitpod

csweichel · csweichel · commit 3155a2b57507 · 2021-12-10T11:35:58.000Z
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,7 +6,7 @@ builds:
   env:
   - CGO_ENABLED=0
   ldflags:
-  - -s -w -X github.com/csweichel/dazzle/cmd/core.version={{.Version}}-{{.ShortCommit}}
+  - -s -w -X github.com/gitpod-io/dazzle/cmd/core.version={{.Version}}-{{.ShortCommit}}
 - id: dazzle-util
   env:
   - CGO_ENABLED=0
@@ -15,7 +15,7 @@ builds:
   flags:
     - -tags=util
   ldflags:
-  - -s -w -X github.com/csweichel/dazzle/cmd/util.version={{.Version}}-{{.ShortCommit}}
+  - -s -w -X github.com/gitpod-io/dazzle/cmd/util.version={{.Version}}-{{.ShortCommit}}
 archives:
 - id: dazzle
   replacements:
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2019 Christian Weichel
+Copyright © 2019 Gitpod
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <img src="logo.png" width="100" style="padding: 1em; background-color: white; border-radius: 10px;">
 
-[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=gitpod)](https://gitpod.io/#https://github.com/csweichel/dazzle)
-[![Go Report Card](https://goreportcard.com/badge/github.com/csweichel/dazzle)](https://goreportcard.com/report/github.com/csweichel/dazzle)
+[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=gitpod)](https://gitpod.io/#https://github.com/gitpod-io/dazzle)
+[![Go Report Card](https://goreportcard.com/badge/github.com/gitpod-io/dazzle)](https://goreportcard.com/report/github.com/gitpod-io/dazzle)
 [![Stability: Experimental](https://masterminds.github.io/stability/experimental.svg)](https://masterminds.github.io/stability/experimental.html)
 
 dazzle is a rather experimental Docker/OCI image builder. Its goal is to build independent layers where a change to one layer does *not* invalidate the ones sitting "above" it.
diff --git a/cmd/core/build.go b/cmd/core/build.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@ package core
 import (
 	"context"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/moby/buildkit/client"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/core/combine.go b/cmd/core/combine.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
 	"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"
diff --git a/cmd/core/project-add-combination.go b/cmd/core/project-add-combination.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/core/project-hash.go b/cmd/core/project-hash.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/core/project-ignore.go b/cmd/core/project-ignore.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/core/project-image-name.go b/cmd/core/project-image-name.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/core/project-init.go b/cmd/core/project-init.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/core/project-manifest.go b/cmd/core/project-manifest.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/csweichel/dazzle/pkg/dazzle"
+	"github.com/gitpod-io/dazzle/pkg/dazzle"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/core/project.go b/cmd/core/project.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/cmd/core/root.go b/cmd/core/root.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,8 @@ import (
 
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
-	"github.com/csweichel/dazzle/pkg/fancylog"
 	"github.com/docker/cli/cli/config"
+	"github.com/gitpod-io/dazzle/pkg/fancylog"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/core/version.go b/cmd/core/version.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/cmd/util/root.go b/cmd/util/root.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/cmd/util/test-add.go b/cmd/util/test-add.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -35,8 +35,8 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/csweichel/dazzle/pkg/fancylog"
-	"github.com/csweichel/dazzle/pkg/test"
+	"github.com/gitpod-io/dazzle/pkg/fancylog"
+	"github.com/gitpod-io/dazzle/pkg/test"
 )
 
 var testAddCmd = &cobra.Command{
diff --git a/cmd/util/test-run.go b/cmd/util/test-run.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +30,8 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
-	"github.com/csweichel/dazzle/pkg/fancylog"
-	"github.com/csweichel/dazzle/pkg/test"
+	"github.com/gitpod-io/dazzle/pkg/fancylog"
+	"github.com/gitpod-io/dazzle/pkg/test"
 )
 
 var testRunCmd = &cobra.Command{
diff --git a/cmd/util/test.go b/cmd/util/test.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/cmd/util/version.go b/cmd/util/version.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/csweichel/dazzle
+module github.com/gitpod-io/dazzle
 
 go 1.16
 
diff --git a/integration_tests.sh b/integration_tests.sh
@@ -3,4 +3,4 @@
 # Run the integration tests
 # NOTE: the TARGET_REF is hostname:port 
 # shellcheck disable=SC2034
-BUILDKIT_ADDR=unix:///run/buildkit/buildkitd.sock TARGET_REF=127.0.0.1:5000 go test -count 1 -run ^Test.*_integration$ github.com/csweichel/dazzle/pkg/dazzle -v
+BUILDKIT_ADDR=unix:///run/buildkit/buildkitd.sock TARGET_REF=127.0.0.1:5000 go test -count 1 -run ^Test.*_integration$ github.com/gitpod-io/dazzle/pkg/dazzle -v
diff --git a/main-util.go b/main-util.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -18,11 +18,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//go:build util
 // +build util
 
 package main
 
-import cmd "github.com/csweichel/dazzle/cmd/util"
+import cmd "github.com/gitpod-io/dazzle/cmd/util"
 
 func main() {
 	cmd.Execute()
diff --git a/main.go b/main.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -18,11 +18,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//go:build !util
 // +build !util
 
 package main
 
-import cmd "github.com/csweichel/dazzle/cmd/core"
+import cmd "github.com/gitpod-io/dazzle/cmd/core"
 
 func main() {
 	cmd.Execute()
diff --git a/pkg/dazzle/build.go b/pkg/dazzle/build.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -34,9 +34,9 @@ import (
 	clog "github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
-	"github.com/csweichel/dazzle/pkg/test"
-	"github.com/csweichel/dazzle/pkg/test/buildkit"
 	"github.com/docker/distribution/reference"
+	"github.com/gitpod-io/dazzle/pkg/test"
+	"github.com/gitpod-io/dazzle/pkg/test/buildkit"
 	"github.com/mattn/go-isatty"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/session"
diff --git a/pkg/dazzle/build_test.go b/pkg/dazzle/build_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/pkg/dazzle/combiner.go b/pkg/dazzle/combiner.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +27,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/csweichel/dazzle/pkg/test"
-	"github.com/csweichel/dazzle/pkg/test/buildkit"
 	"github.com/docker/distribution/reference"
+	"github.com/gitpod-io/dazzle/pkg/test"
+	"github.com/gitpod-io/dazzle/pkg/test/buildkit"
 	"github.com/moby/buildkit/client"
 	"github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/pkg/dazzle/project.go b/pkg/dazzle/project.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -31,8 +31,8 @@ import (
 	"strings"
 
 	"github.com/bmatcuk/doublestar"
-	"github.com/csweichel/dazzle/pkg/test"
 	"github.com/docker/distribution/reference"
+	"github.com/gitpod-io/dazzle/pkg/test"
 	"github.com/minio/highwayhash"
 	ignore "github.com/sabhiram/go-gitignore"
 	"gopkg.in/yaml.v2"
diff --git a/pkg/dazzle/project_test.go b/pkg/dazzle/project_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -313,10 +313,10 @@ func TestProjectChunk_hash(t *testing.T) {
 `),
 				},
 			},
-			Base:        "",
-			BaseRef:     "",
-			Chunk:       "base",
-			Expectation: "a557385d3e9d012dd179eaf7569850107c4af1adf8d99eb0fc402727827fab14",
+			Base:         "",
+			BaseRef:      "",
+			Chunk:        "base",
+			Expectation:  "a557385d3e9d012dd179eaf7569850107c4af1adf8d99eb0fc402727827fab14",
 			IncludeTests: true,
 		},
 		{
@@ -334,10 +334,10 @@ func TestProjectChunk_hash(t *testing.T) {
 `),
 				},
 			},
-			Base:        "",
-			BaseRef:     "",
-			Chunk:       "base",
-			Expectation: "cf686202a95f644d3767667c6172b6b29c4d225db23bcc8d17aa4bdb42224b58",
+			Base:         "",
+			BaseRef:      "",
+			Chunk:        "base",
+			Expectation:  "cf686202a95f644d3767667c6172b6b29c4d225db23bcc8d17aa4bdb42224b58",
 			IncludeTests: true,
 		},
 		{
diff --git a/pkg/dazzle/registry.go b/pkg/dazzle/registry.go
@@ -1,4 +1,4 @@
-// Copyright © 2020 Christian Weichel
+// Copyright © 2020 Gitpod
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/pkg/test/buildkit/container.go b/pkg/test/buildkit/container.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/csweichel/dazzle/pkg/test"
-	"github.com/csweichel/dazzle/pkg/test/runner"
+	"github.com/gitpod-io/dazzle/pkg/test"
+	"github.com/gitpod-io/dazzle/pkg/test/runner"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/session"
diff --git a/pkg/test/generate-schema.go b/pkg/test/generate-schema.go
diff --git a/pkg/test/runner/build.sh b/pkg/test/runner/build.sh
diff --git a/pkg/test/runner/caller.go b/pkg/test/runner/caller.go
diff --git a/pkg/test/runner/main.go b/pkg/test/runner/main.go
diff --git a/tools.go b/tools.go
