From 980d37c5d064b88c375c8bc80a5a77aafc4a1ccb Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 14 Feb 2018 02:26:21 +0100
Subject: [pkg] get golang dependencies in the base image

---
 pkg/docker_build_riseupvpn | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'pkg/docker_build_riseupvpn')

diff --git a/pkg/docker_build_riseupvpn b/pkg/docker_build_riseupvpn
index ab859c27..baa41575 100644
--- a/pkg/docker_build_riseupvpn
+++ b/pkg/docker_build_riseupvpn
@@ -5,10 +5,9 @@
 : ${BRANCH:="master"}
 
 # build bitmask-systray
+# (dependencies should already be in the base image)
 
 export GOPATH=/srv/go
-echo "[+] Building deps for bitmask-systray..."
-go get 0xacab.org/leap/bitmask-systray
 cd /src/leap && git clone https://0xacab.org/leap/bitmask-systray
 cd bitmask-systray && go build .
 
@@ -17,7 +16,7 @@ cd $HOME
 echo "[+] CLONING REPO from $REPO [$BRANCH]"
 git clone $REPO bitmaskbuild
 cd bitmaskbuild
-RELEASE=bitmask-`cat pkg/next-version`
+RELEASE=anonvpn-`cat pkg/next-version`
 echo "[+] RELEASE: $RELEASE"
 git checkout $BRANCH
 git fetch --tags
@@ -29,7 +28,7 @@ rm -rf src/leap/bitmask/mail
 # get anonvpn bundle
 VIRTUAL_ENV=/usr/local make bundle_anonvpn_linux
 # copy systray binary
-cp /src/leap/bitmask-systray/bitmask-systray dist/${RELEASE}/lib/
+cp /src/leap/bitmask-systray/bitmask-systray dist/anonvpn-${RELEASE}/lib/
 # rename entrypoing
-mv dist/${RELEASE}/bitmask dist/${RELEASE}/riseupvpn
+mv dist/anonvpn-${RELEASE}/bitmask dist/anonvpn-${RELEASE}/riseupvpn
 cp -r dist/* /dist
-- 
cgit v1.2.3