docker/protonmail-bridge
docker/protonmail-bridge
1
0
Fork 0
Code Pull requests Releases 10 Activity

Fixed socat/ports.

Browse source
This commit is contained in:
michael 2020-05-21 15:45:01 -05:00
parent f5f2d79d3b
commit 8e64d18c2b
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -13,8 +13,8 @@ RUN make build-nogui
FROM alpine:edge FROM alpine:edge
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV SMTP_PORT 1025 ENV SMTP_PORT 25
ENV IMAP_PORT 1143 ENV IMAP_PORT 143
COPY --from=build /usr/src/proton-bridge/Desktop-Bridge /bin/protonmail-bridge COPY --from=build /usr/src/proton-bridge/Desktop-Bridge /bin/protonmail-bridge
RUN apk add --no-cache \ RUN apk add --no-cache \
libsecret \ libsecret \

6
entrypoint
View file

@ -4,6 +4,7 @@
# fallback # fallback
USER_ID=${PUID:-9001} USER_ID=${PUID:-9001}
GROUP_ID=${PGID:-$USER_ID} GROUP_ID=${PGID:-$USER_ID}
echo "Starting with UID : $USER_ID:$GROUP_ID" echo "Starting with UID : $USER_ID:$GROUP_ID"
addgroup -g $GROUP_ID proton addgroup -g $GROUP_ID proton
@ -12,4 +13,9 @@ chown -R ${USER_ID}:${GROUP_ID} /var/lib/proton
export HOME=/var/lib/proton export HOME=/var/lib/proton
# socat will make the conn appear to come from 127.0.0.1
# ProtonMail Bridge currently expects that.
socat TCP-LISTEN:$SMTP_PORT,fork TCP:127.0.0.1:1025 &
socat TCP-LISTEN:$IMAP_PORT,fork TCP:127.0.0.1:1143 &
exec /sbin/su-exec proton "$@" exec /sbin/su-exec proton "$@"

10
initproton
View file

@ -3,8 +3,8 @@ set -eufo pipefail
BRIDGE=/bin/protonmail-bridge BRIDGE=/bin/protonmail-bridge
PRINT_INFO=${PRINT_INFO:-""} PRINT_INFO=${PRINT_INFO:-""}
SMTP_PORT=${SMTP_PORT:-"1025"} SMTP_PORT=${SMTP_PORT:-"25"}
IMAP_PORT=${IMAP_PORT:-"1143"} IMAP_PORT=${IMAP_PORT:-"143"}
#### INIT #### INIT
PASS_FILE=${PASS_FILE:-} PASS_FILE=${PASS_FILE:-}
@ -31,12 +31,6 @@ if [ -n "$PRINT_INFO" ]; then
echo info | $BRIDGE --cli | egrep '(Username|Password)' | sort -ru echo info | $BRIDGE --cli | egrep '(Username|Password)' | sort -ru
fi fi
# socat will make the conn appear to come from 127.0.0.1
# ProtonMail Bridge currently expects that.
# It also allows us to bind to the real ports :)
socat TCP-LISTEN:$SMTP_PORT,fork TCP:127.0.0.1:1025 &
socat TCP-LISTEN:$IMAP_PORT,fork TCP:127.0.0.1:1143 &
# Fake a terminal, so it does not quit because of EOF... # Fake a terminal, so it does not quit because of EOF...
rm -f faketty rm -f faketty
mkfifo faketty mkfifo faketty