commit 81b0dbc49855d3dcc986db144f3a3b6e48d7ea3a
Author: Wim <wim@42.be>
Date: Fri Feb 17 22:32:42 2017 +0000
Add githash to docker builds
diff --git a/Dockerfile b/Dockerfile
index e2f5466..bcf173b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66 +66 @@ RUN apk update && apk add go git gcc musl-dev ca-certificates \
&& cd /go/src/github.com/42wim/matterbridge \
&& export GOPATH=/go \
&& go get \
- && go build -o /bin/matterbridge \
+ && go build -x -ldflags "-X main.githash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge \
&& rm -rf /go \
&& apk del --purge git go gcc musl-dev
diff --git a/matterbridge.go b/matterbridge.go
index 32bc428..7dfaaa2 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -97 +910 @@ import (
log "github.com/Sirupsen/logrus"
)
-var version = "0.9.3-dev"
+var (
+ version = "0.9.3-dev"
+ githash string
+)
func init() {
log.SetFormatter(&log.TextFormatter{FullTimestamp: true})
@@ -2125 +2425 @@ func main() {
flagVersion := flag.Bool("version", false, "show version")
flag.Parse()
if *flagVersion {
- fmt.Println("version:", version)
+ fmt.Printf("version: %s %s\n", version, githash)
return
}
flag.Parse()
if *flagDebug {
- log.Info("enabling debug")
+ log.Info("Enabling debug")
log.SetLevel(log.DebugLevel)
}
- fmt.Println("running version", version)
+ log.Printf("Running version %s %s", version, githash)
cfg := config.NewConfig(*flagConfig)
for _, gw := range cfg.SameChannelGateway {
if !gw.Enable {
continue
}
- fmt.Printf("starting samechannel gateway %#v\n", gw.Name)
+ log.Printf("Starting samechannel gateway %#v", gw.Name)
g := samechannelgateway.New(cfg, &gw)
err := g.Start()
if err != nil {
- log.Fatalf("starting gateway failed %#v", err)
+ log.Fatalf("Starting gateway failed %#v", err)
}
}
@@ -4711 +5011 @@ func main() {
if !gw.Enable {
continue
}
- fmt.Printf("starting gateway %#v\n", gw.Name)
+ log.Printf("Starting gateway %#v", gw.Name)
g := gateway.New(cfg, &gw)
err := g.Start()
if err != nil {
- log.Fatalf("starting gateway failed %#v", err)
+ log.Fatalf("Starting gateway failed %#v", err)
}
}
select {}
