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

Removed SMTP/IMAP port variables, exposed ports.

Browse source
This commit is contained in:
michael 2020-05-22 11:26:10 -05:00
parent 4c35ecad32
commit c6bc75bb21
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -13,8 +13,6 @@ RUN make build-nogui
FROM alpine:edge FROM alpine:edge
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV SMTP_PORT 25
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 \
@ -27,5 +25,7 @@ COPY initproton /bin/
RUN chmod +x /bin/initproton RUN chmod +x /bin/initproton
COPY gpgparams /tmp/ COPY gpgparams /tmp/
WORKDIR /var/lib/proton WORKDIR /var/lib/proton
EXPOSE 25/tcp
EXPOSE 143/tcp
ENTRYPOINT ["/bin/entrypoint"] ENTRYPOINT ["/bin/entrypoint"]
CMD ["/bin/initproton"] CMD ["/bin/initproton"]

4
entrypoint
View file

@ -13,7 +13,7 @@ export HOME=/var/lib/proton
# The ProtonMail Bridge expects connections from 127.0.0.1. Use socat to # The ProtonMail Bridge expects connections from 127.0.0.1. Use socat to
# redirect incoming connections to localhost. Also, this allows us to use # redirect incoming connections to localhost. Also, this allows us to use
# the default SMTP/IMAP ports. # the default SMTP/IMAP ports.
socat TCP-LISTEN:$SMTP_PORT,fork TCP:127.0.0.1:1025 & socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
socat TCP-LISTEN:$IMAP_PORT,fork TCP:127.0.0.1:1143 & socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
exec /sbin/su-exec proton "$@" exec /sbin/su-exec proton "$@"

2
initproton
View file

@ -3,8 +3,6 @@ set -eufo pipefail
BRIDGE=/bin/protonmail-bridge BRIDGE=/bin/protonmail-bridge
PRINT_INFO=${PRINT_INFO:-""} PRINT_INFO=${PRINT_INFO:-""}
SMTP_PORT=${SMTP_PORT:-"25"}
IMAP_PORT=${IMAP_PORT:-"143"}
#### INIT #### INIT
PASS_FILE=${PASS_FILE:-} PASS_FILE=${PASS_FILE:-}