imporvment

Signed-off-by: Patrick Eschenbach <[email protected]>

dagger/main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"time"
 )
 
 const (
@@ -43,27 +44,24 @@ func (m *HarborCli) BuildDev(
 		log.Fatalf("Error parsing platform: %v", err)
 	}
 	builder := dag.Container().
-		From("golang:"+GO_VERSION+"-alpine").
+		From("golang:"+GO_VERSION).
 		WithMountedCache("/go/pkg/mod", dag.CacheVolume("go-mod-"+GO_VERSION)).
 		WithEnvVariable("GOMODCACHE", "/go/pkg/mod").
 		WithMountedCache("/go/build-cache", dag.CacheVolume("go-build-"+GO_VERSION)).
 		WithEnvVariable("GOCACHE", "/go/build-cache").
 		WithMountedDirectory("/src", m.Source). // Ensure the source directory with go.mod is mounted
 		WithWorkdir("/src").
 		WithEnvVariable("GOOS", os).
-		WithEnvVariable("GOARCH", arch).
-		WithExec([]string{"apk", "add", "--no-cache", "git"}).
-		WithExec([]string{
-			"sh",
-			"-c",
-			fmt.Sprintf(`
-				go build -ldflags "-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=dev \
-						  -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.GoVersion=$(go version | awk '{print $3}') \
-						  -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.GitCommit=$(git rev-parse --short HEAD) \
-						  -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.BuildTime=$(date -u +"%%Y-%%m-%%dT%%H:%%M:%%SZ")" \
-					  -o %s %s
-			`, "bin/harbor-cli", "cmd/harbor/main.go"),
-		})
+		WithEnvVariable("GOARCH", arch)
+
+	gitCommit, _ := builder.WithExec([]string{"git", "rev-parse", "--short", "HEAD"}).Stdout(ctx)
+	buildTime := time.Now().UTC().Format(time.RFC3339)
+	ldflagsArgs := fmt.Sprintf(`-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=dev 
+						  -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.GoVersion=%s 
+						  -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.GitCommit=%s 
+						  -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.BuildTime=%s
+				`, GO_VERSION, buildTime, gitCommit)
+	builder = builder.WithExec([]string{"go", "build", "-ldflags", ldflagsArgs, "-o", "bin/harbor-cli", "cmd/harbor/main.go"})
 	return builder.File("bin/harbor-cli")
 }
 
@@ -85,7 +83,7 @@ func (m *HarborCli) build(
 		for _, goarch := range arches {
 			bin_path := fmt.Sprintf("build/%s/%s/", goos, goarch)
 			builder := dag.Container().
-				From("golang:"+GO_VERSION+"-alpine").
+				From("golang:"+GO_VERSION).
 				WithMountedCache("/go/pkg/mod", dag.CacheVolume("go-mod-"+GO_VERSION)).
 				WithEnvVariable("GOMODCACHE", "/go/pkg/mod").
 				WithMountedCache("/go/build-cache", dag.CacheVolume("go-build-"+GO_VERSION)).
@@ -94,7 +92,8 @@ func (m *HarborCli) build(
 				WithWorkdir("/src").
 				WithEnvVariable("GOOS", goos).
 				WithEnvVariable("GOARCH", goarch).
-				WithExec([]string{"apk", "add", "--no-cache", "git"}).
+				WithExec([]string{"git", "describe", "--tags", "--abbrev=0", ">>", "git-version.txt"}).
+				Terminal().
 				WithExec([]string{
 					"sh",
 					"-c",