chore: migrate to latest core version and move modules under the wabe…

…net umbrella

README.md

@@ -70,7 +70,7 @@ Flags:
 By default, dodo is bundled with the config plugin, which searches the working
 directory and user home directory for YAML config files.
 
-Take a look at the [plugin repository](github.com/dodo-cli/dodo-config) for a
+Take a look at the [plugin repository](github.com/wabenet/dodo-config) for a
 defailed description of the configuration format.
 
 ### examples

dodo.yaml

@@ -2,11 +2,10 @@ backdrops:
   make:
     image:
       steps: |
-        FROM golang:1.16-alpine3.12
+        FROM golang:1.18
         ENV CGO_ENABLED=0
-        RUN apk add -U git bash curl tree make
-        RUN go get -u github.com/dave/jennifer/jen
-        RUN curl -sSfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
+        RUN apt-get update && apt-get install -y git bash curl tree make
+        RUN go install github.com/goreleaser/goreleaser@latest
         RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.27.0
     volumes:
       - "{{ projectRoot }}:/build"

generate.yaml

@@ -1,7 +1,7 @@
 ---
 plugins:
-  - import: github.com/dodo-cli/dodo/plugin
-  - import: github.com/dodo-cli/dodo-core/plugin
-  - import: github.com/dodo-cli/dodo-buildkit/plugin
-  - import: github.com/dodo-cli/dodo-config/plugin
-  - import: github.com/dodo-cli/dodo-docker/plugin
+  - import: github.com/wabenet/dodo/plugin
+  - import: github.com/wabenet/dodo-core/plugin
+  - import: github.com/wabenet/dodo-config/pkg/plugin
+  - import: github.com/wabenet/dodo-buildkit/pkg/plugin
+  - import: github.com/wabenet/dodo-docker/pkg/plugin

generate/main.go

@@ -35,14 +35,14 @@ func main() {
 	)
 
 	f.Func().Id("execute").Params().Int().Block(
-		jen.Id("m").Op(":=").Qual("github.com/dodo-cli/dodo-core/pkg/plugin", "Init").Call(),
+		jen.Id("m").Op(":=").Qual("github.com/wabenet/dodo-core/pkg/plugin", "Init").Call(),
 		jen.Id("includePlugins").Call(jen.Id("m")),
 		jen.Id("m").Dot("LoadPlugins").Call(),
 		jen.Defer().Id("m").Dot("UnloadPlugins").Call(),
-                jen.Return(jen.Qual("github.com/dodo-cli/dodo/pkg/command/dodo", "ExecuteDodoMain").Call(jen.Id("m"))),
+		jen.Return(jen.Qual("github.com/wabenet/dodo/pkg/command/dodo", "ExecuteDodoMain").Call(jen.Id("m"))),
 	)
 
-	f.Func().Id("includePlugins").Params(jen.Id("m").Qual("github.com/dodo-cli/dodo-core/pkg/plugin", "Manager")).BlockFunc(func(g *jen.Group) {
+	f.Func().Id("includePlugins").Params(jen.Id("m").Qual("github.com/wabenet/dodo-core/pkg/plugin", "Manager")).BlockFunc(func(g *jen.Group) {
 		for _, p := range cfg.Plugins {
 			g.Qual(p.Import, "IncludeMe").Call(jen.Id("m"))
 		}

go.mod

@@ -1,6 +1,6 @@
-module github.com/dodo-cli/dodo
+module github.com/wabenet/dodo
 
-go 1.16
+go 1.18
 
 // TODO: This is currently necessary because of changes in buildkit.
 // This part should probably be handled by the code generator.
@@ -10,14 +10,106 @@ replace (
 )
 
 require (
-	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/dave/jennifer v1.4.1
-	github.com/dodo-cli/dodo-buildkit v0.2.1
-	github.com/dodo-cli/dodo-config v0.2.1
-	github.com/dodo-cli/dodo-core v0.4.0
-	github.com/dodo-cli/dodo-docker v0.2.3
 	github.com/hashicorp/go-hclog v0.16.2
-	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/spf13/cobra v1.1.3
+	github.com/wabenet/dodo-buildkit v0.3.1
+	github.com/wabenet/dodo-config v0.3.1
+	github.com/wabenet/dodo-core v0.6.0
+	github.com/wabenet/dodo-docker v0.4.0
 	gopkg.in/yaml.v2 v2.4.0
 )
+
+require (
+	cuelang.org/go v0.4.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+	github.com/Masterminds/goutils v1.1.0 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
+	github.com/Microsoft/go-winio v0.5.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cockroachdb/apd/v2 v2.0.1 // indirect
+	github.com/containerd/console v1.0.3 // indirect
+	github.com/containerd/containerd v1.6.6 // indirect
+	github.com/containerd/continuity v0.2.2 // indirect
+	github.com/containerd/typeurl v1.0.2 // indirect
+	github.com/deckarep/golang-set v1.7.1 // indirect
+	github.com/docker/cli v20.10.0-beta1.0.20201029214301-1d20b15adc38+incompatible // indirect
+	github.com/docker/distribution v2.8.0+incompatible // indirect
+	github.com/docker/docker v20.10.2+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.6.3 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-metrics v0.0.1 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/emicklei/proto v1.6.15 // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // 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/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-plugin v1.4.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
+	github.com/huandu/xstrings v1.3.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea // indirect
+	github.com/kr/pretty v0.2.1 // indirect
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.3.1 // indirect
+	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/moby/buildkit v0.8.0-rc3 // indirect
+	github.com/moby/sys/signal v0.6.0 // indirect
+	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
+	github.com/oclaussen/go-gimme/configfiles v0.0.0-20200205175519-d9560e60c720 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.11.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.30.0 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/spf13/afero v1.2.2 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.7.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85 // indirect
+	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
+	google.golang.org/grpc v1.43.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/ini.v1 v1.56.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)