fix version flag; fix #24

.github/workflows/build.yml

@@ -76,6 +76,8 @@ jobs:
           if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
             TAGS="$TAGS,${DOCKER_IMAGE}:latest"
           fi
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=date::$(date --utc +'%Y-%m-%dT%H:%M:%SZ')
           echo ::set-output name=tags::${TAGS}
 
       - name: Set up Docker Buildx
@@ -92,3 +94,4 @@ jobs:
         with:
           push: true
           tags: ${{ steps.prep.outputs.tags }}
+          build-args: VERSION=${{ steps.prep.output.version }},COMMIT=${{ github.sha }},DATE=${{ steps.prep.output.date }}

.goreleaser.yml

@@ -6,8 +6,7 @@ before:
 builds:
   - env:
     - CGO_ENABLED=0
-    ldflags:
-    - -s -w
+    ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
     goos:
     - linux
     goarch:

Dockerfile

@@ -6,10 +6,12 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
-RUN CGO_ENABLED=0 go build -o /go/bin/dalga ./cmd/dalga
+ARG VERSION
+ARG COMMIT
+ARG DATE
+RUN CGO_ENABLED=0 go build -o /go/bin/dalga -ldflags="-s -w -X main.version=$VERSION -X main.commit=$COMMIT -X main.date=$DATE" ./cmd/dalga
 
 FROM alpine:latest
-ARG GO_PROJECT
 RUN touch /etc/dalga.toml
 COPY --from=0 /go/bin/dalga /bin/dalga
 ENTRYPOINT ["/bin/dalga", "-config", "/etc/dalga.toml"]

cmd/dalga/main.go

@@ -17,18 +17,32 @@ import (
 	"github.com/knadh/koanf/providers/file"
 )
 
+// These variables are set by goreleaser on build.
 var (
-	config       = flag.String("config", "dalga.toml", "config file")
-	version      = flag.Bool("version", false, "print version")
+	version = "0.0.0"
+	commit  = ""
+	date    = ""
+)
+
+var (
+	configFlag   = flag.String("config", "dalga.toml", "config file")
+	versionFlag  = flag.Bool("version", false, "print version")
 	createTables = flag.Bool("create-tables", false, "create table for storing jobs")
 	debug        = flag.Bool("debug", false, "turn on debug messages")
 )
 
+func versionString() string {
+	if len(commit) > 7 {
+		commit = commit[:7]
+	}
+	return fmt.Sprintf("%s (%s) [%s]", version, commit, date)
+}
+
 func main() {
 	flag.Parse()
 
-	if *version {
-		fmt.Println(dalga.Version)
+	if *versionFlag {
+		fmt.Println(versionString())
 		return
 	}
 
@@ -70,7 +84,7 @@ func main() {
 func readConfig() (c dalga.Config, err error) {
 	c = dalga.DefaultConfig
 	k := koanf.New(".")
-	err = k.Load(file.Provider(*config), toml.Parser())
+	err = k.Load(file.Provider(*configFlag), toml.Parser())
 	if err != nil {
 		return
 	}

dalga.go

@@ -17,8 +17,6 @@ import (
 	"github.com/cenkalti/dalga/v3/internal/table"
 )
 
-const Version = "2.0.0"
-
 // Dalga is a job scheduler.
 type Dalga struct {
 	config    Config