mirror of
https://github.com/shenxn/protonmail-bridge-docker.git
synced 2026-03-26 21:35:58 +00:00
Merge 2b602eac73 into 97014ae98c
This commit is contained in:
commit
093bd7a6ae
@ -4,7 +4,7 @@ FROM debian:sid-slim AS build
|
|||||||
ARG version
|
ARG version
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev
|
RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev libfido2-dev libcbor-dev
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
|
ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
|
||||||
@ -19,7 +19,7 @@ EXPOSE 143/tcp
|
|||||||
|
|
||||||
# Install dependencies and protonmail bridge
|
# Install dependencies and protonmail bridge
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates \
|
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates libfido2-1 procps tmux \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Copy bash scripts
|
# Copy bash scripts
|
||||||
|
|||||||
@ -16,7 +16,11 @@ if [[ $1 == init ]]; then
|
|||||||
pkill protonmail-bridge || true
|
pkill protonmail-bridge || true
|
||||||
|
|
||||||
# Login
|
# Login
|
||||||
/protonmail/proton-bridge --cli $@
|
tmux new-session -d -s bridge-init "/protonmail/proton-bridge --cli $@"
|
||||||
|
echo "ProtonMail Bridge init running inside tmux session 'bridge-init'"
|
||||||
|
echo "Attach with: docker exec -it <container> tmux attach -t bridge-init"
|
||||||
|
|
||||||
|
sleep infinity
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
@ -26,10 +30,10 @@ else
|
|||||||
socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
|
socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
|
||||||
socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
|
socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
|
||||||
|
|
||||||
# Start protonmail
|
tmux new-session -d -s bridge "/protonmail/proton-bridge --cli $@"
|
||||||
# Fake a terminal, so it does not quit because of EOF...
|
echo "ProtonMail Bridge running inside tmux session 'bridge'"
|
||||||
rm -f faketty
|
echo "Attach with: docker exec -it <container> tmux attach -t bridge"
|
||||||
mkfifo faketty
|
|
||||||
cat faketty | /protonmail/proton-bridge --cli $@
|
sleep infinity
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user