From 8d2e576fc26a4c792d73f2f09a22faad66d6c6b9 Mon Sep 17 00:00:00 2001 From: Eric Trenkel Date: Sat, 17 Jan 2026 08:52:08 +0100 Subject: [PATCH 1/2] Add workaround for stale gpg-agent socket in entrypoint scripts --- build/entrypoint.sh | 6 ++++++ deb/entrypoint.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 1931087..df71743 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -2,6 +2,12 @@ set -ex +# Workaround for stale gpg-agent socket causing auth failures on restart +# Cleans up leftover sockets in the GPG home directory +if [ -d /root/.gnupg ]; then + rm -f /root/.gnupg/S.gpg-agent* +fi + # Initialize if [[ $1 == init ]]; then diff --git a/deb/entrypoint.sh b/deb/entrypoint.sh index 13637e5..3f81e42 100644 --- a/deb/entrypoint.sh +++ b/deb/entrypoint.sh @@ -2,6 +2,12 @@ set -ex +# Workaround for stale gpg-agent socket causing auth failures on restart +# Cleans up leftover sockets in the GPG home directory +if [ -d /root/.gnupg ]; then + rm -f /root/.gnupg/S.gpg-agent* +fi + # Initialize if [[ $1 == init ]]; then From 2b9894f41316dc57227ee945cad570a1c55daa21 Mon Sep 17 00:00:00 2001 From: Eric Trenkel Date: Sat, 17 Jan 2026 08:53:17 +0100 Subject: [PATCH 2/2] Refactor entrypoint scripts to keep faketty open and ensure proper bridge execution --- build/entrypoint.sh | 11 ++++++++++- deb/entrypoint.sh | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/build/entrypoint.sh b/build/entrypoint.sh index df71743..463c94b 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -36,6 +36,15 @@ else # Fake a terminal, so it does not quit because of EOF... rm -f faketty mkfifo faketty - cat faketty | /protonmail/proton-bridge --cli $@ + + # Keep faketty open + sleep infinity > faketty & + + # Start bridge reading from faketty + /protonmail/proton-bridge --cli $@ < faketty & + + # Wait for the bridge to exit + wait $! + exit $? fi diff --git a/deb/entrypoint.sh b/deb/entrypoint.sh index 3f81e42..94c9f77 100644 --- a/deb/entrypoint.sh +++ b/deb/entrypoint.sh @@ -50,6 +50,15 @@ else # Fake a terminal, so it does not quit because of EOF... rm -f faketty mkfifo faketty - cat faketty | protonmail-bridge --cli + + # Keep faketty open + sleep infinity > faketty & + + # Start bridge reading from faketty + protonmail-bridge --cli < faketty & + + # Wait for the bridge to exit + wait $! + exit $? fi