From 2c262c0d0ee6a4e037b5fd300b64c95a4486cd2d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 11 Mar 2026 07:00:17 +0100 Subject: [PATCH] change /build to /build/proton-bridge/ and add pass into build image and copy vault-editor into base image --- build/Dockerfile | 13 ++++++++----- build/entrypoint.sh | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 036f7f4..97c808e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -7,11 +7,12 @@ RUN apt-get update && apt-get install -y \ build-essential \ libsecret-1-dev \ libfido2-dev \ - libcbor-dev + libcbor-dev \ + pass # Build -ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/ -WORKDIR /build/ +ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/proton-bridge/ +WORKDIR /build/proton-bridge/ RUN sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go RUN set -eux; \ make build-nogui vault-editor @@ -33,7 +34,9 @@ RUN apt-get update \ COPY gpgparams entrypoint.sh /protonmail/ # Copy protonmail -COPY --from=build /build/bridge /protonmail/ -COPY --from=build /build/proton-bridge /protonmail/ +WORKDIR /usr/bin/ +COPY --from=build /build/proton-bridge/bridge /usr/bin/ +COPY --from=build /build/proton-bridge/proton-bridge /usr/bin/ +COPY --from=build /build/proton-bridge/vault-editor /usr/bin/ ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"] diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 5c4c017..4914e3b 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -16,7 +16,7 @@ if [[ $1 == init ]]; then pkill protonmail-bridge || true # Login - /protonmail/proton-bridge --cli $@ + proton-bridge --cli $@ else eval "$(dbus-launch --sh-syntax --exit-with-session)" @@ -25,6 +25,6 @@ else # Fake a terminal, so it does not quit because of EOF... rm -f faketty mkfifo faketty - cat faketty | /protonmail/proton-bridge --cli $@ + cat faketty | proton-bridge --cli $@ fi