summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-11-29 01:19:10 +0100
committerGitHub <noreply@github.com>2021-11-29 01:19:10 +0100
commitbd0516f09ad2b5a21f3bc0c19de1ff3d1dcf9662 (patch)
tree0f17e7bbd4288af7851a3937f94fcdec4de739be
parentdf4d76e46653424aaac85b93466c247702a400a6 (diff)
downloadmatterbridge-msglm-bd0516f09ad2b5a21f3bc0c19de1ff3d1dcf9662.tar.gz
matterbridge-msglm-bd0516f09ad2b5a21f3bc0c19de1ff3d1dcf9662.tar.bz2
matterbridge-msglm-bd0516f09ad2b5a21f3bc0c19de1ff3d1dcf9662.zip
Use Alpine stable again in Dockerfile (#1643)
* Use alpine stable again * fix build for tgs.Dockerfile
-rw-r--r--Dockerfile2
-rw-r--r--tgs.Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 6a2b8659..0874b30f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge AS builder
+FROM alpine AS builder
COPY . /go/src/matterbridge
RUN apk --no-cache add go git \
diff --git a/tgs.Dockerfile b/tgs.Dockerfile
index 5badc0a7..e093531d 100644
--- a/tgs.Dockerfile
+++ b/tgs.Dockerfile
@@ -5,7 +5,7 @@ RUN apk add \
go \
git \
&& cd /go/src/matterbridge \
- && go build -mod vendor -ldflags "-X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge
+ && CGO_ENABLED=0 go build -mod vendor -ldflags "-X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o /bin/matterbridge
FROM alpine
RUN apk --no-cache add \