From 11cf98c1f4c10c68196d8e687ffa1d400b417bfa Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 6 Dec 2024 00:18:35 +0000 Subject: [PATCH 01/18] Bump build version to 3.15.1 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 4bcbd94..d0adf2c 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.15.0 \ No newline at end of file +3.15.1 \ No newline at end of file From 7090760703aa69a2b50203399c11c6eae0797fb4 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 12 Dec 2024 00:18:23 +0000 Subject: [PATCH 02/18] Bump deb version to 3.15.1-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 8529945..cf5a46b 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.15.0-1 \ No newline at end of file +3.15.1-1 \ No newline at end of file From c7cef794821ea4ef3d2e9f4eed7ca9ea6c234f53 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 18 Dec 2024 00:18:00 +0000 Subject: [PATCH 03/18] Bump build version to 3.16.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index d0adf2c..7ccd8d4 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.15.1 \ No newline at end of file +3.16.0 \ No newline at end of file From a92c7d34d63c87697c22a60140a73875ad160a59 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 15 Jan 2025 00:16:57 +0000 Subject: [PATCH 04/18] Bump deb version to 3.16.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index cf5a46b..218a88a 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.15.1-1 \ No newline at end of file +3.16.0-1 \ No newline at end of file From 1cd0a1e01a10fac5aab7e4cf82fbde3e6e5f7c10 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 30 Jan 2025 00:16:31 +0000 Subject: [PATCH 05/18] Bump build version to 3.17.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 7ccd8d4..f85bf6e 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.16.0 \ No newline at end of file +3.17.0 \ No newline at end of file From 6d4c8eee6c1bb6064a2e8f379a5cd52b90d96ee3 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 11 Feb 2025 00:17:05 +0000 Subject: [PATCH 06/18] Bump deb version to 3.17.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 218a88a..6be871b 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.16.0-1 \ No newline at end of file +3.17.0-1 \ No newline at end of file From 718ccfacc27c98d2bcf3eb22727dc0c5f226f78a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 13 Feb 2025 00:17:18 +0000 Subject: [PATCH 07/18] Bump build version to 3.20.12 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index f85bf6e..a9fd49d 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.17.0 \ No newline at end of file +3.20.12 \ No newline at end of file From 3d628a35e3122b3085bd125132aa58c192f44925 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 14 Feb 2025 00:17:17 +0000 Subject: [PATCH 08/18] Bump deb version to 3.16.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 6be871b..218a88a 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.17.0-1 \ No newline at end of file +3.16.0-1 \ No newline at end of file From d2828adae6be0207c5c4e646b809dff01d0e20f5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 14 Feb 2025 00:17:18 +0000 Subject: [PATCH 09/18] Bump build version to 3.17.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index a9fd49d..f85bf6e 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.20.12 \ No newline at end of file +3.17.0 \ No newline at end of file From a19458f703eefdd382dd61ed453f798d85236853 Mon Sep 17 00:00:00 2001 From: simonfelding <45149055+simonfelding@users.noreply.github.com> Date: Sat, 15 Feb 2025 17:07:15 +0100 Subject: [PATCH 10/18] fix builds by switching base layer to debian:sid-slim tested locally, works fine. debian has supported riscv64 in the sid image for some time. this is the same thing the carlosedp/golang image did. this also fixes the bug with the wrong glibc version, as the build container now uses the same glibc version as the final container. --- build/Dockerfile | 7 +++---- deb/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1971c40..b2f01f4 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,15 +1,14 @@ -# Use carlosedp/golang for riscv64 support -FROM carlosedp/golang:1.18 AS build +FROM debian:sid-slim AS build # Install dependencies -RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev +RUN apt-get update && apt-get install -y git golang build-essential libsecret-1-dev # Build WORKDIR /build/ COPY build.sh VERSION /build/ RUN bash build.sh -FROM ubuntu:jammy +FROM debian:sid-slim LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp diff --git a/deb/Dockerfile b/deb/Dockerfile index 8aa8bc7..ddebcac 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM debian:sid-slim LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp 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 11/18] 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< Date: Mon, 17 Feb 2025 10:15:22 +0100 Subject: [PATCH 12/18] deb build: make sure it has the necessary tools (#116) --- deb/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deb/Dockerfile b/deb/Dockerfile index ddebcac..8ef00b6 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -9,6 +9,13 @@ WORKDIR /protonmail # Copy bash scripts COPY gpgparams install.sh entrypoint.sh VERSION /protonmail/ +RUN apt-get update \ + && apt-get install -y --no-install-recommends socat pass procps libsecret-1-0 ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# Copy bash scripts +COPY gpgparams entrypoint.sh /protonmail/ + # Install dependencies and protonmail bridge RUN bash install.sh From 8ffef3485385f11fc53383438449006ebb283a9a Mon Sep 17 00:00:00 2001 From: schklom <23263086+schklom@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:03:56 +0000 Subject: [PATCH 13/18] Build when deb/* changes (#97) The build calls to Protonmail's repo and builds from it. When that repo changes (i.e. when deb/* changes), the image should be built again. --------- Co-authored-by: Simon Ungar Felding <45149055+simonfelding@users.noreply.github.com> --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 439396a..cb20661 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,10 +8,13 @@ on: paths: - .github/workflows/build.yaml - build/* + - deb/* pull_request: paths: - .github/workflows/build.yaml - build/* + - deb/* + workflow_dispatch: env: DOCKER_REPO: shenxn/protonmail-bridge From c87479ac5147a6ddfca5462ae3286a16c80da22d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 20 Feb 2025 00:17:27 +0000 Subject: [PATCH 14/18] Bump deb version to 3.17.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 218a88a..6be871b 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.16.0-1 \ No newline at end of file +3.17.0-1 \ No newline at end of file From 2bd42d97cae89b7d17c84b4de91a39a7040fb7b8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 28 Feb 2025 00:17:35 +0000 Subject: [PATCH 15/18] Bump build version to 3.18.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index f85bf6e..ae56155 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.17.0 \ No newline at end of file +3.18.0 \ No newline at end of file From 794e58400a0644a2064c63bf81f69cb481dd942c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 7 Mar 2025 00:17:55 +0000 Subject: [PATCH 16/18] Bump deb version to 3.18.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 6be871b..75dbd24 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.17.0-1 \ No newline at end of file +3.18.0-1 \ No newline at end of file From 546f813ea4879aad6e226191d231db66f6880c05 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 19 Mar 2025 00:18:37 +0000 Subject: [PATCH 17/18] Bump build version to 3.19.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index ae56155..209f579 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.18.0 \ No newline at end of file +3.19.0 \ No newline at end of file From 540ba69528378b4fd7d557807d69ee9a03a64dcf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 2 Apr 2025 00:18:53 +0000 Subject: [PATCH 18/18] Bump deb version to 3.19.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 75dbd24..e177934 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.18.0-1 \ No newline at end of file +3.19.0-1 \ No newline at end of file