diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-14 02:26:21 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-15 16:36:56 +0100 |
| commit | 980d37c5d064b88c375c8bc80a5a77aafc4a1ccb (patch) | |
| tree | 15a437eafb6765ecd37c64da7e110b226dda550d | |
| parent | bfda65b93510d8f1e0e8c8e9a95a245ac4524f4c (diff) | |
[pkg] get golang dependencies in the base image
| -rw-r--r-- | pkg/docker_build_riseupvpn | 9 | ||||
| -rw-r--r-- | pkg/docker_bundleapt/Dockerfile | 3 |
2 files changed, 4 insertions, 8 deletions
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 diff --git a/pkg/docker_bundleapt/Dockerfile b/pkg/docker_bundleapt/Dockerfile index ee07a1c2..0e79cf3c 100644 --- a/pkg/docker_bundleapt/Dockerfile +++ b/pkg/docker_bundleapt/Dockerfile @@ -74,6 +74,3 @@ RUN ln -s /usr/lib/python2.7/dist-packages/sip.pyi /usr/local/lib/python2.7/site # get dependencies for bitmask-systray so that builds are quick RUN export GOPATH=/srv/go && go get 0xacab.org/leap/bitmask-systray - -# get ourselves a shell -RUN apt-get install bash |