From 73759e539b0eff270ef70598911d83d6da858f71 Mon Sep 17 00:00:00 2001
From: David Florness <david@florness.com>
Date: Tue, 2 Nov 2021 18:02:17 -0400
Subject: [PATCH] contrib: build image using local files instead of official
 latest

---
 contrib/Dockerfile         | 7 ++++---
 contrib/docker-compose.yml | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/contrib/Dockerfile b/contrib/Dockerfile
index 2c2311d..1bc47c8 100644
--- a/contrib/Dockerfile
+++ b/contrib/Dockerfile
@@ -1,12 +1,13 @@
 FROM alpine AS builder
 
 RUN apk update
-RUN apk add go olm-dev g++
-RUN go install git.hnitbjorg.xyz/~edwargix/msc-link-bot@latest
+RUN apk add g++ go make olm-dev
+COPY . .
+RUN make
 
 FROM alpine
 
-COPY --from=builder /root/go/bin/msc-link-bot /usr/local/bin/msc-link-bot
+COPY --from=builder /msc-link-bot /usr/local/bin/msc-link-bot
 RUN apk add olm && \
     adduser -h /msclinkbot -S msclinkbot
 
diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml
index 22b73e3..db813ad 100644
--- a/contrib/docker-compose.yml
+++ b/contrib/docker-compose.yml
@@ -2,7 +2,9 @@ version: "3"
 
 services:
   msclinkbot:
-    build: .
+    build:
+      context: ..
+      dockerfile: contrib/Dockerfile
     environment:
       HOMESERVER: https://matrix.example.org
       USER_ID: '@msclinkbot:example.org'
-- 
2.38.4