From 55ffa5a1155269767e233a2b0f683495c8f8acb1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 13 Aug 2020 07:36:56 -0700
Subject: [PATCH] fix path for shapeshifter-dispatcher binary

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 619bc58..89da049 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,7 @@ RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y -
 ENV GOPATH=/go
 WORKDIR $GOPATH
 RUN git clone https://github.com/OperatorFoundation/shapeshifter-dispatcher && cd shapeshifter-dispatcher && go build
-#RUN go get -u github.com/OperatorFoundation/shapeshifter-dispatcher
-RUN strip $GOPATH/bin/shapeshifter-dispatcher
+RUN strip /shapeshifter-dispatcher/bin/shapeshifter-dispatcher
 RUN go get -u github.com/kumina/openvpn_exporter
 RUN strip $GOPATH/bin/openvpn_exporter
 
@@ -18,7 +17,7 @@ FROM registry.git.autistici.org/ai3/docker/chaperone-base
 # needed for buster, but chaperone-base image is still stretch
 #RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
 
-COPY --from=build /go/bin/shapeshifter-dispatcher /usr/local/bin/shapeshifter-dispatcher
+COPY --from=build /shapeshifter-dispatcher/shapeshifter-dispatcher /usr/local/bin/shapeshifter-dispatcher
 COPY --from=build /usr/sbin/openvpn /usr/sbin/openvpn
 COPY --from=build /go/bin/openvpn_exporter /usr/local/bin/openvpn_exporter
 COPY chaperone.d/ /etc/chaperone.d
-- 
GitLab