change /build to /build/proton-bridge/ and add pass into build image and copy vault-editor into base image
Build and Push Docker Container / build-and-push (push) Successful in 5m48s

This commit is contained in:
GitHub Actions
2026-03-11 07:00:17 +01:00
parent b224418fbd
commit 2c262c0d0e
2 changed files with 10 additions and 7 deletions
+8 -5
View File
@@ -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"]
+2 -2
View File
@@ -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