mirror of
https://github.com/shenxn/protonmail-bridge-docker.git
synced 2026-03-26 21:35:58 +00:00
- Drop faketty named pipe and screen; daemon runs via exec protonmail-bridge --noninteractive
so stdout/stderr reach docker logs natively and SIGTERM lands directly on the bridge
- Add PTY_TOOL build ARG/ENV (dtach default, abduco, reptyr) for interactive sessions only
- Split commands: init (first-time setup), run (daemon), manage (interactive CLI), attach (reattach)
- PTY machinery isolated to manage/attach; restart loop and log forwarding hacks removed
- Fix $1 unbound variable with ${1:-}, set -ex replaced with set -euo pipefail
- chmod +x consolidated into install RUN layer; healthcheck -exc fixed to -c
- CMD switched to exec form to ensure signals reach entrypoint directly
152 lines
5.1 KiB
Bash
152 lines
5.1 KiB
Bash
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
PTY_TOOL="${PTY_TOOL:-dtach}"
|
|
BRIDGE_SOCK=/protonmail/bridge.sock
|
|
BRIDGE_PID_FILE=/protonmail/bridge.pid
|
|
|
|
# Clean stale gpg-agent sockets left from a previous run
|
|
rm -f /root/.gnupg/S.gpg-agent* 2>/dev/null || true
|
|
|
|
# --- PTY helpers (only used by: init, manage, attach) ---
|
|
|
|
pty_start() {
|
|
case "${PTY_TOOL}" in
|
|
dtach) dtach -n "${BRIDGE_SOCK}" "$@" ;;
|
|
abduco) abduco -n bridge "$@" ;;
|
|
# reptyr re-attaches existing PIDs; use nohup+setsid to launch headlessly instead
|
|
reptyr) setsid "$@" </dev/null &>/dev/null & echo $! > "${BRIDGE_PID_FILE}" ;;
|
|
esac
|
|
}
|
|
|
|
pty_attach() {
|
|
case "${PTY_TOOL}" in
|
|
dtach) exec dtach -a "${BRIDGE_SOCK}" -e '^\' ;;
|
|
abduco) exec abduco -a bridge ;;
|
|
reptyr) exec reptyr "$(cat "${BRIDGE_PID_FILE}")" ;;
|
|
esac
|
|
}
|
|
|
|
detach_hint() {
|
|
case "${PTY_TOOL}" in
|
|
dtach|abduco) echo "Ctrl+\\" ;;
|
|
reptyr) echo "Ctrl+C" ;;
|
|
esac
|
|
}
|
|
|
|
# Wait up to $1 seconds for the bridge socket (or PID file) to appear
|
|
wait_for_session() {
|
|
local timeout="${1:-10}"
|
|
local elapsed=0
|
|
while [[ "${elapsed}" -lt "${timeout}" ]]; do
|
|
case "${PTY_TOOL}" in
|
|
dtach|abduco) [[ -S "${BRIDGE_SOCK}" ]] && return 0 ;;
|
|
reptyr) [[ -f "${BRIDGE_PID_FILE}" ]] && return 0 ;;
|
|
esac
|
|
sleep 1
|
|
(( elapsed++ )) || true
|
|
done
|
|
echo "ERROR: bridge session did not start within ${timeout}s." >&2
|
|
return 1
|
|
}
|
|
|
|
# --- Commands ---
|
|
|
|
CMD="${1:-run}"
|
|
|
|
case "${CMD}" in
|
|
|
|
init)
|
|
# One-time setup: generate GPG key, init password store, interactive login.
|
|
# Run as: docker run -it <image> init
|
|
gpg --generate-key --batch /protonmail/gpgparams
|
|
pass init pass-key
|
|
exec protonmail-bridge --cli
|
|
;;
|
|
|
|
manage)
|
|
# Open an interactive --cli session for account management (add/remove accounts etc).
|
|
# Run as: docker run -it --rm -v <data-volume> <image> manage
|
|
# NOTE: Stop the running daemon container first to avoid port/lock conflicts.
|
|
CONTAINER_ID=$(hostname)
|
|
echo " Starting management session... [PTY_TOOL=${PTY_TOOL}]"
|
|
pty_start protonmail-bridge --cli
|
|
|
|
# Wait for the session socket/pid to appear before printing attach instructions
|
|
wait_for_session 10
|
|
|
|
echo " Management session ready."
|
|
echo " Attach: docker exec -it ${CONTAINER_ID} /protonmail/entrypoint.sh attach"
|
|
echo " Detach: $(detach_hint)"
|
|
;;
|
|
|
|
attach)
|
|
# Reattach to a running manage session.
|
|
case "${PTY_TOOL}" in
|
|
dtach|abduco)
|
|
if [[ ! -S "${BRIDGE_SOCK}" ]]; then
|
|
echo "ERROR: No active session found (${BRIDGE_SOCK} does not exist)." >&2
|
|
echo " Start one first: docker exec -it \$(hostname) /protonmail/entrypoint.sh manage" >&2
|
|
exit 1
|
|
fi
|
|
;;
|
|
reptyr)
|
|
if [[ ! -f "${BRIDGE_PID_FILE}" ]]; then
|
|
echo "ERROR: No active session found (${BRIDGE_PID_FILE} does not exist)." >&2
|
|
echo " Start one first: docker exec -it \$(hostname) /protonmail/entrypoint.sh manage" >&2
|
|
exit 1
|
|
fi
|
|
;;
|
|
esac
|
|
pty_attach
|
|
;;
|
|
|
|
run)
|
|
# Daemon mode: --noninteractive runs headless, output goes directly to docker logs.
|
|
CONTAINER_ID=$(hostname)
|
|
echo "========================================"
|
|
echo " ProtonMail Bridge daemon starting..."
|
|
echo " Container: ${CONTAINER_ID}"
|
|
echo ""
|
|
echo " Available commands:"
|
|
echo " First-time setup:"
|
|
echo " docker run -it <image> init"
|
|
echo ""
|
|
echo " Manage accounts (stop daemon first):"
|
|
echo " docker run -it --rm -v <data-volume> <image> manage"
|
|
echo ""
|
|
echo " Attach to a running manage session:"
|
|
echo " docker exec -it ${CONTAINER_ID} /protonmail/entrypoint.sh attach"
|
|
echo ""
|
|
echo " View logs:"
|
|
echo " docker logs -f ${CONTAINER_ID}"
|
|
echo "========================================"
|
|
|
|
# socat forwards standard ports to bridge's localhost-only listener ports.
|
|
socat TCP-LISTEN:25,fork,reuseaddr TCP:127.0.0.1:1025,nodelay &
|
|
SOCAT_SMTP_PID=$!
|
|
socat TCP-LISTEN:143,fork,reuseaddr TCP:127.0.0.1:1143,nodelay &
|
|
SOCAT_IMAP_PID=$!
|
|
|
|
# Verify both socat processes started successfully
|
|
sleep 1
|
|
for pid in "${SOCAT_SMTP_PID}" "${SOCAT_IMAP_PID}"; do
|
|
if ! kill -0 "${pid}" 2>/dev/null; then
|
|
echo "ERROR: socat port-forward (pid ${pid}) failed to start." >&2
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
# exec replaces the shell so the bridge becomes the waited-on process.
|
|
# docker stop sends SIGTERM directly to it. socat processes are reaped on exit.
|
|
exec protonmail-bridge --noninteractive
|
|
;;
|
|
|
|
*)
|
|
echo "Usage: entrypoint.sh [init|manage|attach|run]" >&2
|
|
exit 1
|
|
;;
|
|
|
|
esac
|