summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-08-19 19:23:47 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-08-19 19:47:48 +0200
commit12753e2c138c446fdd81809224c8cdf7f0ecea19 (patch)
treee8fc7ff64319a77121c7fff3c2c011ed15838532
parent0b42faaf6b4d37b0f4441f8b3b54723b26652399 (diff)
[pkg] allow to build for any branch
otherwise we're always building what is in leap master
-rw-r--r--Dockerfile10
1 files 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"]
-