From 12753e2c138c446fdd81809224c8cdf7f0ecea19 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Wed, 19 Aug 2020 19:23:47 +0200
Subject: [pkg] allow to build for any branch

otherwise we're always building what is in leap master
---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b867132..db70f3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,15 @@ RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y -
 # don't need to do bash tricks to keep the layers small, as this is a multi-stage build
 ENV GOPATH=/go
 WORKDIR $GOPATH
-RUN go get -u 0xacab.org/leap/vpnweb
-RUN strip $GOPATH/bin/vpnweb
+#RUN go get -u 0xacab.org/leap/vpnweb
+
+COPY . /vpnweb
+RUN cd /vpnweb && go build
+RUN strip /vpnweb/vpnweb
 
 FROM registry.git.autistici.org/ai3/docker/chaperone-base
 
-COPY --from=build /go/bin/vpnweb /usr/local/bin/vpnweb
+COPY --from=build /vpnweb/vpnweb /usr/local/bin/vpnweb
 COPY chaperone.d/ /etc/chaperone.d
 
 ENTRYPOINT ["/usr/local/bin/chaperone"]
-
-- 
cgit v1.2.3