Compile time versioning (#42)

Compile time versioning
* Add LDFLAGS to CI script, bring everything else in line with that method
* Remove docker-entrypoint.sh

.goreleaser.dev.yml

@@ -4,6 +4,12 @@ builds:
   goos:
     - darwin
     - linux
+  ldflags:
+    - -s -w
+    - -X 'github.com/olegsu/iris/pkg/util.BuildVersion={{.Version}}'
+    - -X 'github.com/olegsu/iris/pkg/util.BuildDate={{.Date}}'
+    - -X 'github.com/olegsu/iris/pkg/util.BuildCommit={{.ShortCommit}}'
+    - -X 'github.com/olegsu/iris/pkg/util.BuildBy=goreleaser'
 archive:
   replacements:
     darwin: Darwin
@@ -17,4 +23,4 @@ changelog:
   filters:
     exclude:
     - '^docs:'
-    - '^test:'
+    - '^test:'

.goreleaser.yml

@@ -5,6 +5,13 @@ builds:
     - darwin
     - linux
     - windows
+  ldflags:
+    - -s -w
+    - -X 'github.com/olegsu/iris/pkg/util.BuildVersion={{.Version}}'
+    - -X 'github.com/olegsu/iris/pkg/util.BuildDate={{.Date}}'
+    - -X 'github.com/olegsu/iris/pkg/util.BuildCommit={{.ShortCommit}}'
+    - -X 'github.com/olegsu/iris/pkg/util.BuildBy=goreleaser'
+
 archive:
   replacements:
     darwin: Darwin
@@ -24,4 +31,4 @@ changelog:
   filters:
     exclude:
     - '^docs:'
-    - '^test:'
+    - '^test:'

Dockerfile

@@ -1,10 +1,8 @@
 FROM alpine:3.8
 
-RUN apk add --update ca-certificates
+RUN apk --no-cache add --update ca-certificates
 
 COPY dist/iris_linux_386/iris /usr/local/bin/
-COPY hack/docker_entrypoint.sh /entrypoint.sh
-COPY VERSION /VERSION
 
-ENTRYPOINT ["sh", "entrypoint.sh"]
-CMD [ "--help" ]
+ENTRYPOINT ["/usr/local/bin/iris"]
+CMD [ "--help" ]

VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

cmd/root.go

@@ -15,7 +15,7 @@ package cmd
 // limitations under the License.
 
 import (
-	"os"
+	"github.com/olegsu/iris/pkg/util"
 
 	"github.com/spf13/cobra"
 )
@@ -27,7 +27,7 @@ var rootCmdOptions struct {
 var rootCmd = &cobra.Command{
 	Use:     "iris",
 	Long:    "Watch on Kubernetes events, filter and send them as standard wehbook to any system",
-	Version: os.Getenv("IRIS_VERSION"),
+	Version: util.BuildVersion,
 }
 
 // Execute - execute the root command

codefresh.yaml

@@ -4,32 +4,34 @@ stages:
 - Integration
 - Delivery
 
+
 steps:
 
   Prepare:
-    title: Update Helm package version  
+    title: Update Helm package version
     image: alpine:3.8
     stage: Integration
     commands:
     - apk add --no-cache curl jq python py-pip
     - pip install yq
     - sh ${{CF_VOLUME_PATH}}/iris/hack/.codefresh/push-helm.sh
+      # ^-- cfexports IRIS_VERSION from VERSION file
 
   Test:
     title: Run unit test
     image: golang:1.11
     stage: Integration
     commands:
     - make test
-    
+
   PushingHelmChart:
-    title: Push Helm package to repo  
+    title: Push Helm package to repo
     stage: Delivery
     image: codefresh/cfstep-helm:2.9.0
     environment:
     - ACTION=push
     - CHART_REF=iris
-    
+
   CreatingGitTag:
     title: Push tag to git
     image: codefresh/cli
@@ -44,7 +46,7 @@ steps:
       branch:
         only:
         - master
-  
+
   Releasing:
     image: goreleaser/goreleaser
     stage: Delivery
@@ -56,7 +58,7 @@ steps:
       branch:
         only:
         - master
-  
+
   BuildBinaries:
     image: goreleaser/goreleaser
     stage: Delivery
@@ -86,7 +88,7 @@ steps:
     - ${{CF_BRANCH_TAG_NORMALIZED}}
     - ${{IRIS_VERSION}}
     registry: dockerhub
-    
+
   PushingToDockerRegistryLatest:
     title: Pushing to Docker Registry
     type: push
@@ -97,4 +99,4 @@ steps:
     when:
       branch:
         only:
-        - master
+        - master

hack/build.sh

@@ -1,6 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
-OUTFILE=/usr/local/bin/irisctl
-go build -o $OUTFILE main.go
 
-chmod +x $OUTFILE
+OUTFILE=${1:-/usr/local/bin/irisctl}
+BUILD_DATE=$(date)
+GIT_TAG=$(git describe --tags)
+GIT_COMMIT=$(git rev-parse --short HEAD)
+
+LDFLAGS="-s -w
+ -X 'github.com/olegsu/iris/pkg/util.BuildVersion=${GIT_TAG}'
+ -X 'github.com/olegsu/iris/pkg/util.BuildDate=${BUILD_DATE}'
+ -X 'github.com/olegsu/iris/pkg/util.BuildCommit=${GIT_COMMIT}'
+ -X 'github.com/olegsu/iris/pkg/util.BuildBy=Makefile'
+"
+
+go build -ldflags "$LDFLAGS" -o "$OUTFILE" main.go

pkg/destination/destination.go

@@ -4,7 +4,6 @@ import (
 	"github.com/olegsu/iris/pkg/kube"
 	"github.com/olegsu/iris/pkg/logger"
 	"github.com/olegsu/iris/pkg/util"
-	"os"
 )
 
 const (
@@ -13,7 +12,7 @@ const (
 )
 
 var (
-	UserAgent = "iris/" + os.Getenv("IRIS_VERSION")
+	UserAgent = "iris/" + util.BuildVersion
 )
 
 type Destination interface {

pkg/util/util.go

@@ -9,6 +9,10 @@ import (
 	yaml "gopkg.in/yaml.v2"
 )
 
+var (
+	BuildVersion, BuildDate, BuildCommit, BuildBy string
+)
+
 func UnmarshalOrDie(in []byte, out interface{}, logger logger.Logger) {
 	err := yaml.Unmarshal(in, out)
 	if err != nil {