fixes

build/entrypoint.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
-
-set -ex
+set -eoux pipefail
 
 # Initialize
-if [[ $1 == init ]]; then
-
+if [[ "${1:-}" == "init" ]]; then
     # Initialize pass
     gpg --generate-key --batch /protonmail/gpgparams
     pass init pass-key
@@ -17,9 +15,16 @@ if [[ $1 == init ]]; then
 
     # Login
     /protonmail/proton-bridge --cli $@
+elif [[ "${1:-}" == "cli" ]]; then
+    # Kill the other instance as only one can be running at a time.
+    # This allows users to run entrypoint init inside a running conainter
+    # which is useful in a k8s environment.
+    # || true to make sure this would not fail in case there is no running instance.
+    pkill protonmail-bridge || true
 
+    # Login
+    /protonmail/proton-bridge --cli $@
 else
-
     # 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 :)
@@ -31,5 +36,4 @@ else
     rm -f faketty
     mkfifo faketty
     cat faketty | /protonmail/proton-bridge --cli $@
-
 fi