From d00645ffccbc02e13adc9e9fd67f71e38c96fa6f Mon Sep 17 00:00:00 2001 From: simonfelding <45149055+simonfelding@users.noreply.github.com> Date: Sat, 15 Feb 2025 19:38:15 +0100 Subject: [PATCH] add vaulteditor and fix build on arm (#114) first working build for a long time --- build/Dockerfile | 4 +++- build/build.sh | 12 +----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index b2f01f4..a54e04a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,3 +1,4 @@ +# The build image could be golang, but it currently does not support riscv64. Only debian:sid does, at the time of writing. FROM debian:sid-slim AS build # Install dependencies @@ -9,7 +10,7 @@ COPY build.sh VERSION /build/ RUN bash build.sh FROM debian:sid-slim -LABEL maintainer="Xiaonan Shen " +LABEL maintainer="Simon Felding " EXPOSE 25/tcp EXPOSE 143/tcp @@ -25,5 +26,6 @@ COPY gpgparams entrypoint.sh /protonmail/ # Copy protonmail COPY --from=build /build/proton-bridge/bridge /protonmail/ COPY --from=build /build/proton-bridge/proton-bridge /protonmail/ +COPY --from=build /build/proton-bridge/vault-editor /protonmail/ ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"] diff --git a/build/build.sh b/build/build.sh index 91f2772..0b27550 100644 --- a/build/build.sh +++ b/build/build.sh @@ -9,15 +9,5 @@ git clone https://github.com/ProtonMail/proton-bridge.git cd proton-bridge git checkout v$VERSION -ARCH=$(uname -m) -if [[ $ARCH == "armv7l" ]] ; then - # This is expected to fail, and we use the following patch to fix - make build-nogui || true - # For 32bit architectures, there was a overflow error on the parser - # This is a workaround for this problem found at: - # https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106 - find $(go env GOPATH)/pkg/mod/github.com/\!proton\!mail/go-rfc5322*/ -type f -exec sed -i.bak 's/(1<