improve build readability and speed (by parallelization) (#117)

build/.dockerignore

@@ -1,8 +0,0 @@
-*
-
-!.dockerignore
-!VERSION
-!entrypoint.sh
-!gpgparams
-!Dockerfile
-!build.sh

build/Dockerfile

@@ -1,13 +1,15 @@
 # The build image could be golang, but it currently does not support riscv64. Only debian:sid does, at the time of writing.
 FROM debian:sid-slim AS build
 
+ARG version
+
 # Install dependencies
-RUN apt-get update && apt-get install -y git golang build-essential libsecret-1-dev
+RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev
 
 # Build
+ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
 WORKDIR /build/
-COPY build.sh VERSION /build/
-RUN bash build.sh
+RUN make build-nogui vault-editor
 
 FROM debian:sid-slim
 LABEL maintainer="Simon Felding <sife@adm.ku.dk>"
@@ -24,8 +26,8 @@ RUN apt-get update \
 COPY gpgparams entrypoint.sh /protonmail/
 
 # Copy protonmail
-COPY --from=build /build/proton-bridge/bridge /protonmail/
-COPY --from=build /build/proton-bridge/proton-bridge /protonmail/
-COPY --from=build /build/proton-bridge/vault-editor /protonmail/
+COPY --from=build /build/bridge /protonmail/
+COPY --from=build /build/proton-bridge /protonmail/
+COPY --from=build /build/vault-editor /protonmail/
 
 ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]

build/VERSION

@@ -1 +0,0 @@
-3.19.0

build/build.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-VERSION=`cat VERSION`
-
-# Clone new code
-git clone https://github.com/ProtonMail/proton-bridge.git
-cd proton-bridge
-git checkout v$VERSION
-
-# Build
-make build-nogui vault-editor