Dockerfile

@@ -2,7 +2,6 @@
 FROM golang:1.14-alpine as build
 ENV LANG C.UTF-8
 RUN apk add --no-cache \
-      curl \
       gcc \
       git \
       libsecret-dev \
@@ -10,19 +9,11 @@ RUN apk add --no-cache \
       musl-dev
 WORKDIR /usr/src
 
-ARG RELEASE
 ARG TAG
-RUN if [ -n "$RELEASE" ]; then \
+RUN git clone https://github.com/ProtonMail/proton-bridge.git proton-bridge \
-         echo "Using release $RELEASE..." \
+    && cd proton-bridge \
-      && curl -L -s "https://github.com/ProtonMail/proton-bridge/archive/$RELEASE.tar.gz" | tar zx \
+    && if [ -n "$TAG" ]; then echo "Using tags/$TAG..."; git checkout tags/$TAG; fi \
-      && ln -s "proton-bridge-$RELEASE" proton-bridge \
+    && make build-nogui
-      && cd proton-bridge \
-  ; else \
-         git clone https://github.com/ProtonMail/proton-bridge.git proton-bridge \
-      && cd proton-bridge \
-      && if [ -n "$TAG" ]; then echo "Using tags/$TAG..."; git checkout tags/$TAG; fi \
-  ; fi \
- && make build-nogui
 
 # Create a container for the ProtonMail Bridge.
 FROM alpine:edge
@@ -31,7 +22,7 @@ ENV LANG C.UTF-8
 EXPOSE 25/tcp
 EXPOSE 143/tcp
 
-COPY --from=build /usr/src/proton-bridge/proton-bridge /bin/proton-bridge
+COPY --from=build /usr/src/proton-bridge/Desktop-Bridge /bin/protonmail-bridge
 COPY entrypoint /bin/
 COPY initproton /bin/
 RUN apk add --no-cache \

initproton

@@ -1,7 +1,7 @@
 #!/bin/bash                                                                     
 set -eufo pipefail
 
-BRIDGE=/bin/proton-bridge
+BRIDGE=/bin/protonmail-bridge
 FIFO=/tmp/fifo
 PRINT_INFO=${PRINT_INFO:-""}