From b98d56dcf615c53e2304c4290b14f404a0f58f31 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sun, 17 Oct 2021 14:19:26 +0200
Subject: [PATCH] Fix docker build
---
Dockerfile | 4 ++--
matterbridge.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 82673d81..8e2dded6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM alpine AS builder
+FROM alpine:edge AS builder
COPY . /go/src/matterbridge
RUN apk --no-cache add go git \
&& cd /go/src/matterbridge \
- && go build -mod vendor -ldflags "-X main.githash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge
+ && CGO_ENABLED=0 go build -mod vendor -ldflags "-X main.githash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge
FROM alpine
RUN apk --no-cache add ca-certificates mailcap
diff --git a/matterbridge.go b/matterbridge.go
index 18adda5b..32476dee 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -16,7 +16,7 @@ import (
)
var (
- version = "1.22.4-dev"
+ version = "1.23.0-dev"
githash string
flagConfig = flag.String("conf", "matterbridge.toml", "config file")