add build time to version

ukrainianmr · Aug 9, 2021 · 484cf26 · 484cf26
1 parent 5c2e0b9
commit 484cf26
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,6 +11,9 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date --utc +%Y-%m-%dT%H:%M:%SZ)"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -29,7 +32,9 @@ jobs:
           push: true
           tags: quay.io/bakito/adguardhome-sync:latest,quay.io/bakito/adguardhome-sync:${{ github.event.release.tag_name }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          build-args: VERSION=${{ github.event.release.tag_name }}
+          build-args: |
+            VERSION=${{ github.event.release.tag_name }}
+            BUILD=${{ steps.date.outputs.date }}
 
       - name: Build and push main
         id: docker_build_main
@@ -39,6 +44,8 @@ jobs:
           push: true
           tags: quay.io/bakito/adguardhome-sync:main
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          build-args: VERSION=main
+          build-args: |
+            VERSION=main
+            BUILD=${{ steps.date.outputs.date }}
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -4,7 +4,7 @@ builds:
   - env:
       - CGO_ENABLED=0
     ldflags:
-      - -s -w -X github.com/bakito/adguardhome-sync/version.Version={{.Version}}
+      - -s -w -X github.com/bakito/adguardhome-sync/version.Version={{.Version}} -X github.com/bakito/adguardhome-sync/version.Build={{.Date}}
     goos:
       - linux
       - windows

diff --git a/Dockerfile b/Dockerfile
@@ -5,14 +5,16 @@ WORKDIR /go/src/app
 RUN apt-get update && apt-get install -y upx
 
 ARG VERSION=main
+ARG BUILD="N/A"
+
 ENV GOPROXY=https://goproxy.io \
   GO111MODULE=on \
   CGO_ENABLED=0 \
   GOOS=linux
 
 ADD . /go/src/app/
 
-RUN go build -a -installsuffix cgo -ldflags="-w -s -X github.com/bakito/adguardhome-sync/version.Version=${VERSION}" -o adguardhome-sync . \
+RUN go build -a -installsuffix cgo -ldflags="-w -s -X github.com/bakito/adguardhome-sync/version.Version=${VERSION} -X github.com/bakito/adguardhome-sync/version.Build=${BUILD}" -o adguardhome-sync . \
   && upx -q adguardhome-sync
 
 # application image

diff --git a/pkg/sync/http.go b/pkg/sync/http.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/version"
 )
 
 func (w *worker) handleSync(rw http.ResponseWriter, req *http.Request) {
@@ -62,7 +61,7 @@ func use(h http.HandlerFunc, middleware ...func(http.HandlerFunc) http.HandlerFu
 }
 
 func (w *worker) listenAndServe() {
-	l.With("version", version.Version, "port", w.cfg.API.Port).Info("Starting API server")
+	l.With("port", w.cfg.API.Port).Info("Starting API server")
 
 	ctx, cancel := context.WithCancel(context.Background())
 	mux := http.NewServeMux()

diff --git a/pkg/sync/sync.go b/pkg/sync/sync.go
@@ -27,6 +27,7 @@ func Sync(cfg *types.Config) error {
 		return fmt.Errorf("no replicas configured")
 	}
 
+	l.With("version", version.Version, "build", version.Build).Info("AdGuardHome sync")
 	cfg.Origin.AutoSetup = false
 
 	w := &worker{
@@ -37,7 +38,7 @@ func Sync(cfg *types.Config) error {
 	}
 	if cfg.Cron != "" {
 		w.cron = cron.New()
-		cl := l.With("version", version.Version, "cron", cfg.Cron)
+		cl := l.With("cron", cfg.Cron)
 		_, err := w.cron.AddFunc(cfg.Cron, func() {
 			w.sync()
 		})
@@ -53,7 +54,7 @@ func Sync(cfg *types.Config) error {
 		}
 	}
 	if cfg.RunOnStart {
-		l.With("version", version.Version).Info("Run on startup")
+		l.Info("Running sync on startup")
 		w.sync()
 	}
 	if cfg.API.Port != 0 {

diff --git a/version/version.go b/version/version.go
@@ -3,4 +3,6 @@ package version
 var (
 	// Version the module version
 	Version = "devel"
+	// Build the build time
+	Build = "N/A"
 )