Compare commits
2 commits
89cff04248
...
30c93de13e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30c93de13e | ||
|
|
f3e41a2856 |
2 changed files with 16 additions and 7 deletions
19
Dockerfile
19
Dockerfile
|
|
@ -2,6 +2,7 @@
|
|||
FROM golang:1.14-alpine as build
|
||||
ENV LANG C.UTF-8
|
||||
RUN apk add --no-cache \
|
||||
curl \
|
||||
gcc \
|
||||
git \
|
||||
libsecret-dev \
|
||||
|
|
@ -9,11 +10,19 @@ RUN apk add --no-cache \
|
|||
musl-dev
|
||||
WORKDIR /usr/src
|
||||
|
||||
ARG RELEASE
|
||||
ARG TAG
|
||||
RUN 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 \
|
||||
&& make build-nogui
|
||||
RUN if [ -n "$RELEASE" ]; then \
|
||||
echo "Using release $RELEASE..." \
|
||||
&& curl -L -s "https://github.com/ProtonMail/proton-bridge/archive/$RELEASE.tar.gz" | tar zx \
|
||||
&& ln -s "proton-bridge-$RELEASE" proton-bridge \
|
||||
&& 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
|
||||
|
|
@ -22,7 +31,7 @@ ENV LANG C.UTF-8
|
|||
EXPOSE 25/tcp
|
||||
EXPOSE 143/tcp
|
||||
|
||||
COPY --from=build /usr/src/proton-bridge/Desktop-Bridge /bin/protonmail-bridge
|
||||
COPY --from=build /usr/src/proton-bridge/proton-bridge /bin/proton-bridge
|
||||
COPY entrypoint /bin/
|
||||
COPY initproton /bin/
|
||||
RUN apk add --no-cache \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
set -eufo pipefail
|
||||
|
||||
BRIDGE=/bin/protonmail-bridge
|
||||
BRIDGE=/bin/proton-bridge
|
||||
FIFO=/tmp/fifo
|
||||
PRINT_INFO=${PRINT_INFO:-""}
|
||||
|
||||
|
|
@ -37,4 +37,4 @@ if [ -n "$LOG_LEVEL" ]; then
|
|||
ARGUMENTS="${ARGUMENTS} --log-level ${LOG_LEVEL}"
|
||||
fi
|
||||
|
||||
$BRIDGE $ARGUMENTS
|
||||
$BRIDGE $ARGUMENTS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue