Merge pull request #7 from warm-metal/version

version command and build chain

.gitignore

@@ -0,0 +1,2 @@
+/_output
+/.idea

README.md

@@ -30,10 +30,7 @@ The [csi-driver-image](https://github.com/warm-metal/csi-driver-image) is also n
 You can install the predefined manifests via the `--also-apply-csi-driver` option while starting the debug command.
 Or, you can also apply custom manifests manually. 
 
-If you have golang toolchains, run
-```go
-go install github.com/warm-metal/kubectl-dev
-```
+You can download the binary for either Linux or MacOS from the Release page. Then put it into your `PATH` directory.
 
 ## Usage
 
@@ -57,3 +54,12 @@ kubectl dev build install --minikube
 # Build image in cluster using docker parameters and options.
 kubectl dev build -t docker.io/warmmetal/image:tag -f test.dockerfile .
 ```
+
+## Build
+```shell script
+# For MacOS
+kubectl dev build  -f hack/dev/Dockerfile --local _output/ --target mac-cli
+
+# For Linux
+kubectl dev build  -f hack/dev/Dockerfile --local _output/ --target linux-cli
+```

hack/dev/Dockerfile

@@ -0,0 +1,34 @@
+FROM golang:1-buster as builder
+
+WORKDIR /go/src/kubectl-dev
+COPY go.mod go.sum ./
+RUN go mod download
+COPY .git ./.git
+
+FROM builder as linux
+ENV GOOS=linux
+COPY cmd ./cmd
+COPY pkg ./pkg
+RUN CGO_ENABLED=0 go build \
+    -o kubectl-dev \
+    -ldflags "-X github.com/warm-metal/kubectl-dev/pkg/release.Version=$(git for-each-ref --points-at=HEAD --format='%(refname:short)' refs/tags --sort=-version:refname --count=2)$(git symbolic-ref -q --short HEAD) -X github.com/warm-metal/kubectl-dev/pkg/release.Commit=$(git rev-parse HEAD)" \
+    ./cmd/dev
+
+FROM builder as macos
+ENV GOOS=darwin
+COPY cmd ./cmd
+COPY pkg ./pkg
+RUN CGO_ENABLED=0 go build \
+    -o kubectl-dev \
+    -ldflags "-X github.com/warm-metal/kubectl-dev/pkg/release.Version=$(git for-each-ref --points-at=HEAD --format='%(refname:short)' refs/tags --sort=-version:refname --count=2)$(git symbolic-ref -q --short HEAD) -X github.com/warm-metal/kubectl-dev/pkg/release.Commit=$(git rev-parse HEAD)" \
+    ./cmd/dev
+
+FROM bash:5 as app
+COPY --from=linux /go/src/kubectl-dev/kubectl-dev /usr/local/bin/
+ENTRYPOINT ["tail", "-f", "/dev/null"]
+
+FROM scratch as linux-cli
+COPY --from=linux /go/src/kubectl-dev/kubectl-dev .
+
+FROM scratch as mac-cli
+COPY --from=macos /go/src/kubectl-dev/kubectl-dev .

pkg/cmd/build/build.go

@@ -36,6 +36,7 @@ type BuildOptions struct {
 
 	dockerfile  string
 	tag         string
+	localDir    string
 	targetStage string
 	noCache     bool
 	buildArgs   []string
@@ -105,17 +106,27 @@ func (o *BuildOptions) Complete(cmd *cobra.Command, args []string) error {
 		o.solveOpt.FrontendAttrs["build-arg:"+kv[0]] = kv[1]
 	}
 
-	if len(o.tag) == 0 {
-		return fmt.Errorf("-t or --tag is required")
+	if len(o.tag) == 0 && len(o.localDir) == 0 {
+		return fmt.Errorf("set either a tag or a local path")
 	}
 
-	o.solveOpt.Exports = []buildkit.ExportEntry{
-		{
+	if len(o.tag) > 0 {
+		o.solveOpt.Exports = append(o.solveOpt.Exports, buildkit.ExportEntry{
 			Type: "image",
 			Attrs: map[string]string{
 				"name": o.tag,
 			},
-		},
+		})
+	}
+
+	if len(o.localDir) > 0 {
+		o.solveOpt.Exports = append(o.solveOpt.Exports, buildkit.ExportEntry{
+			Type: "local",
+			Attrs: map[string]string{
+				"dest": o.localDir,
+			},
+			OutputDir: o.localDir,
+		})
 	}
 
 	return nil
@@ -177,7 +188,11 @@ func NewCmd(opts *opts.GlobalOptions, streams genericclioptions.IOStreams) *cobr
 "kubectl-dev build" use buildkitd as its build engine. Since buildkitd only support containerd or oci 
 as its worker, the build command also only support containerd as the container runtime.`,
 		Example: `# Build image in the cluster using docker parameters and options.
-kubectl dev build -t foo:latest -f Dockerfile .`,
+kubectl dev build -t foo:latest -f Dockerfile .
+
+# Build a binary and save to a local directory.
+kubectl dev build -f Dockerfile --local foo/bar/ .
+`,
 		SilenceErrors: false,
 		SilenceUsage:  true,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -199,6 +214,8 @@ kubectl dev build -t foo:latest -f Dockerfile .`,
 		"Name of the Dockerfile (Default is 'PATH/Dockerfile')")
 	cmd.Flags().StringVarP(&o.tag, "tag", "t", "",
 		"Name and optionally a tag in the 'name:tag' format")
+	cmd.Flags().StringVar(&o.localDir, "local", "",
+		"Build binaries instead an image and copy them to the specified path.")
 	cmd.Flags().StringVar(&o.targetStage, "target", "", "Set the target build stage to build.")
 	cmd.Flags().BoolVar(&o.noCache, "no-cache", false, "Do not use cache when building.")
 	cmd.Flags().StringSliceVar(&o.buildArgs, "build-arg", nil, "Set build-time variables.")

pkg/cmd/dev.go

@@ -58,6 +58,8 @@ kubectl dev build -t foo:tag -f Dockerfile .`,
 	}
 
 	cmd.AddCommand(NewCmdDebug(o, streams), build.NewCmd(o, streams))
+	cmd.AddCommand(NewVersionCmd())
+
 	cmd.PersistentFlags().StringVar(&o.DevNamespace, "dev-namespace", "dev",
 		"Namespace in which kubectl-dev coordinators installed")
 	o.AddFlags(cmd.Flags())

pkg/cmd/version.go

@@ -0,0 +1,17 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"github.com/warm-metal/kubectl-dev/pkg/release"
+)
+
+func NewVersionCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Print the version information.",
+		Run: func(_ *cobra.Command, _ []string) {
+			fmt.Println(release.Version, release.Commit)
+		},
+	}
+}

pkg/release/version.go

@@ -0,0 +1,4 @@
+package release
+
+var Version = "v0.1.0"
+var Commit = ""