From 4cf0ad4a095878ede4ae60d3976bfe3869b48fa8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 2 Sep 2021 00:42:48 +0000 Subject: [PATCH 01/38] Bump build version to 1.8.9 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index d2c4b27..5af131d 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.8.7 \ No newline at end of file +1.8.9 \ No newline at end of file From c45548e7680ca08c81598b0558de2bcf03952117 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 14 Sep 2021 00:47:48 +0000 Subject: [PATCH 02/38] Bump deb version to 1.8.9-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 26ed364..f74a135 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -1.8.7-1 \ No newline at end of file +1.8.9-1 \ No newline at end of file From a147e41001757b2e64a3a603c4e83400231bdf73 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 7 Oct 2021 00:48:28 +0000 Subject: [PATCH 03/38] Bump build version to 1.8.10 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 5af131d..7090587 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.8.9 \ No newline at end of file +1.8.10 \ No newline at end of file From 0372093a19bb92e0884575ecad77d2cde0bf31db Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 14 Oct 2021 00:44:23 +0000 Subject: [PATCH 04/38] Bump deb version to 1.8.10-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index f74a135..114ba18 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -1.8.9-1 \ No newline at end of file +1.8.10-1 \ No newline at end of file From 616e4562a9b97fc4dbf5191723167225a331f77f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 19 Nov 2021 00:46:26 +0000 Subject: [PATCH 05/38] Bump build version to 1.8.11 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 7090587..25ce113 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.8.10 \ No newline at end of file +1.8.11 \ No newline at end of file From a76b7f272563f24cd033e49d0554a0a371b75a2e Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 1 Dec 2021 00:49:54 +0000 Subject: [PATCH 06/38] Bump build version to 1.8.12 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 25ce113..c15ef4b 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.8.11 \ No newline at end of file +1.8.12 \ No newline at end of file From 1ebd048bf81727d55a797b1542c3730e3c3a5953 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 7 Dec 2021 00:50:09 +0000 Subject: [PATCH 07/38] Bump deb version to 1.8.12-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 114ba18..661a56d 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -1.8.10-1 \ No newline at end of file +1.8.12-1 \ No newline at end of file From e7020854f2a5c027450ebab1c3002d757d98e4c7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 16 Dec 2021 00:48:19 +0000 Subject: [PATCH 08/38] Bump build version to 2.0.1 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index c15ef4b..10bf840 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -1.8.12 \ No newline at end of file +2.0.1 \ No newline at end of file From 75bee435f5902987a67bc4d1bb1dc0f131618e6e Mon Sep 17 00:00:00 2001 From: Rafael Blumberg Date: Sat, 1 Jan 2022 18:41:44 +0000 Subject: [PATCH 09/38] Workaround to compile for 32bit (#40) * Workaround to compile for 32bit This is a workaround based on [this comment](https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106). It is not a pretty solution but it worked well on my test file. It runs once to compile, if make fails, then it apply the fix and try again, this is done so builds that don't need workaround don't use it and also because the workaround is done on top of downloaded files during ethe first compilation. * Update README to remove ARMv7 error comment --- README.md | 4 ---- build/build.sh | 11 ++++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 853a82d..4c60a72 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,6 @@ Docker Hub: [https://hub.docker.com/r/shenxn/protonmail-bridge](https://hub.dock GitHub: [https://github.com/shenxn/protonmail-bridge-docker](https://github.com/shenxn/protonmail-bridge-docker) -## ARMv7 Builds - -Currently there is a problem building the new parser targeting 32-bit architectures (i.e. `arm/v7`). The latest working build is `1.4.5-build`. Therefore, if you are using an `arm/v7` device like Raspberry Pi, do not upgrade to newer version. More information about the problem can be found [here](https://www.reddit.com/r/ProtonMail/comments/jvzm12/issue_building_bridge_150/). If you have any idea on how to fix this, a PR is welcome. - ## ARM Support We now support ARM devices (`arm64` and `arm/v7`)! Use the images tagged with `build`. See next section for details. diff --git a/build/build.sh b/build/build.sh index 05903bf..660ac4b 100644 --- a/build/build.sh +++ b/build/build.sh @@ -10,4 +10,13 @@ cd proton-bridge git checkout v$VERSION # Build -make build-nogui +if ! make build-nogui ; then + # If build fails it's probably because it is a 32bit + # system and 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: Wed, 19 Jan 2022 00:08:03 +0000 Subject: [PATCH 10/38] Bump build version to 2.1.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 10bf840..50aea0e 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.0.1 \ No newline at end of file +2.1.0 \ No newline at end of file From d73f3f4a63480eff3b2ab76406c6322dbcd0839a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 4 Feb 2022 00:07:28 +0000 Subject: [PATCH 11/38] Bump deb version to 2.1.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 661a56d..ea2ea71 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -1.8.12-1 \ No newline at end of file +2.1.0-1 \ No newline at end of file From db7f0eb889167cbb357dbd3f4700dcb056d9901b Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 10 Feb 2022 00:08:25 +0000 Subject: [PATCH 12/38] Bump deb version to 2.1.1-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index ea2ea71..f17fc9b 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.1.0-1 \ No newline at end of file +2.1.1-1 \ No newline at end of file From 758406337ffb10e830f721c03481f37792dfc952 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 10 Feb 2022 00:08:25 +0000 Subject: [PATCH 13/38] Bump build version to 2.1.1 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 50aea0e..7c32728 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.1.0 \ No newline at end of file +2.1.1 \ No newline at end of file From ba5d5297dcd010ac6353c79f0b4f8c3c6bbffad4 Mon Sep 17 00:00:00 2001 From: Rafael Blumberg Date: Fri, 21 Jan 2022 18:44:55 +0000 Subject: [PATCH 14/38] Add linux/arm/v7 to automate builds After working around 32bits issues, this PR automate arm/v7 builds --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 13bbeba..d7fc6ed 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ on: env: DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev - PLATFORMS: linux/amd64,linux/arm64/v8 + PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7 jobs: build: From 4e11382bdbed93ab3a3f911d9f1b4c8f6c8aade9 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 31 Mar 2022 00:11:19 +0000 Subject: [PATCH 15/38] Bump build version to 2.1.2 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 7c32728..8f9174b 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.1.1 \ No newline at end of file +2.1.2 \ No newline at end of file From 22b04d941d97bdbec63530f763d2ec875623560f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 12 Apr 2022 00:12:24 +0000 Subject: [PATCH 16/38] Bump build version to 2.1.3 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 8f9174b..abae0d9 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.1.2 \ No newline at end of file +2.1.3 \ No newline at end of file From 86e10823e0d937d892074c7f279fa8622e6eb614 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Apr 2022 00:15:49 +0000 Subject: [PATCH 17/38] Bump deb version to 2.1.3-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index f17fc9b..4723323 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.1.1-1 \ No newline at end of file +2.1.3-1 \ No newline at end of file From 680e82076e9313c94330bcccac745db07468854c Mon Sep 17 00:00:00 2001 From: Nilesh Date: Thu, 12 May 2022 11:31:03 -0700 Subject: [PATCH 18/38] Fix entrypoint so it works correctly on init Ran into this issue when trying to use in kubernetes via k8s-at-home/protonmail-bridge. Took a bit of figuring out before I realized I had to manually kill the other instance. The only output from the failed load is a dbus issue, and an immediate exit. --- build/entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 1cebda6..1a88ed3 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -8,6 +8,9 @@ if [[ $1 == init ]]; then # Initialize pass gpg --generate-key --batch /protonmail/gpgparams pass init pass-key + + # Kill the other instance as only one can be running at a time + pkill protonmail-bridge # Login /protonmail/proton-bridge --cli $@ From 664b5e924db18fb58d88e5d77f429c26b0f189c5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 26 May 2022 00:14:14 +0000 Subject: [PATCH 19/38] Bump build version to 2.2.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index abae0d9..e3a4f19 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.1.3 \ No newline at end of file +2.2.0 \ No newline at end of file From 92b0c5bd5f3efa083bef750238a0daa09f0dbfc1 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 22 Jul 2022 00:16:20 +0000 Subject: [PATCH 20/38] Bump build version to 2.2.1 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index e3a4f19..fae692e 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.2.0 \ No newline at end of file +2.2.1 \ No newline at end of file From 14cac1052d6fae5a22af6dcfc0aa383e7fffe07a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Jul 2022 00:15:47 +0000 Subject: [PATCH 21/38] Bump deb version to 2.2.2-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 4723323..a206ee1 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.1.3-1 \ No newline at end of file +2.2.2-1 \ No newline at end of file From a8f5c0a09626510fb593ab8c43c1bc8197c3badd Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 28 Jul 2022 00:15:49 +0000 Subject: [PATCH 22/38] Bump build version to 2.2.2 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index fae692e..7e541ae 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.2.1 \ No newline at end of file +2.2.2 \ No newline at end of file From 2e9d95d90b19d7523d2cfd7638dbddad1e7a170a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 2 Sep 2022 00:15:28 +0000 Subject: [PATCH 23/38] Bump build version to 2.3.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 7e541ae..cc6612c 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.2.2 \ No newline at end of file +2.3.0 \ No newline at end of file From 07d3779fc602f511bca88f7e425e94f73b972d78 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 9 Sep 2022 00:17:44 +0000 Subject: [PATCH 24/38] Bump deb version to 2.3.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index a206ee1..a472920 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.2.2-1 \ No newline at end of file +2.3.0-1 \ No newline at end of file From fa4ddf71260843955298bbecb379c21a28bcf9b8 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 29 Sep 2022 00:23:38 +0000 Subject: [PATCH 25/38] Bump build version to 2.4.0 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index cc6612c..9183195 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.3.0 \ No newline at end of file +2.4.0 \ No newline at end of file From e0b0ce653cf5f9011d2b938ab56fe62607e394ba Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Sun, 16 Oct 2022 14:47:32 +0800 Subject: [PATCH 26/38] Add .vscode to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e69de29..722d5e7 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +.vscode From 0fa5f9fc1339be128661736d0d3f542bab7b3289 Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Sun, 16 Oct 2022 14:49:38 +0800 Subject: [PATCH 27/38] Fix entrypoint init fail issue --- build/entrypoint.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 1a88ed3..1931087 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -9,8 +9,11 @@ if [[ $1 == init ]]; then gpg --generate-key --batch /protonmail/gpgparams pass init pass-key - # Kill the other instance as only one can be running at a time - pkill protonmail-bridge + # 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 $@ From 6decf657c2270a79274ffa7d607b33333815a10b Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Sun, 16 Oct 2022 15:04:58 +0800 Subject: [PATCH 28/38] Bump golang to 1.18 --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index ae1c6f7..693d76f 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 AS build +FROM golang:1.18 AS build # Install dependencies RUN apt-get update && apt-get install -y libsecret-1-dev From acefed1b95d096cef3e2820b5e21e9fa232ebe8e Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 26 Oct 2022 00:16:54 +0000 Subject: [PATCH 29/38] Bump build version to 2.4.3 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 9183195..6550da6 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.4.0 \ No newline at end of file +2.4.3 \ No newline at end of file From 535c80379df8027e87e088a01501f992134d6043 Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Sat, 5 Nov 2022 14:30:33 +0800 Subject: [PATCH 30/38] Copy bridge executable to the image (fixes #66) --- build/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Dockerfile b/build/Dockerfile index 693d76f..ad3fbcf 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -23,6 +23,7 @@ RUN apt-get update \ COPY gpgparams entrypoint.sh /protonmail/ # Copy protonmail +COPY --from=build /build/proton-bridge/bridge /protonmail/ COPY --from=build /build/proton-bridge/proton-bridge /protonmail/ ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"] From 60c8a9ecc4353074275201e11618c0e17344a9b5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 9 Nov 2022 00:16:36 +0000 Subject: [PATCH 31/38] Bump build version to 2.4.5 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 6550da6..26f8b8b 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.4.3 \ No newline at end of file +2.4.5 \ No newline at end of file From 6a2a413d0a35dd8242fca515a03eaa72b91f1c9a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 17 Nov 2022 00:15:47 +0000 Subject: [PATCH 32/38] Bump build version to 2.4.8 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 26f8b8b..752a79e 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.4.5 \ No newline at end of file +2.4.8 \ No newline at end of file From 252397a86db69aff53c64c5fb50819b272e777d4 Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Sun, 6 Nov 2022 13:15:08 +0800 Subject: [PATCH 33/38] Switch to carlosedp/golang for riscv64 support --- build/Dockerfile | 5 +++-- build/build.sh | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index ad3fbcf..5fd445a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,8 @@ -FROM golang:1.18 AS build +# Use carlosedp/golang for riscv64 support +FROM carlosedp/golang:1.18 AS build # Install dependencies -RUN apt-get update && apt-get install -y libsecret-1-dev +RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev # Build WORKDIR /build/ diff --git a/build/build.sh b/build/build.sh index 660ac4b..91f2772 100644 --- a/build/build.sh +++ b/build/build.sh @@ -9,14 +9,15 @@ git clone https://github.com/ProtonMail/proton-bridge.git cd proton-bridge git checkout v$VERSION -# Build -if ! make build-nogui ; then - # If build fails it's probably because it is a 32bit - # system and there was a overflow error on the parser +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: Wed, 6 Apr 2022 14:14:31 +0200 Subject: [PATCH 34/38] Add riscv64 support to docker builds * Adjust GitHub CI to also build for riscv64 * Update base Ubuntu base for build from 18.04 LTS to 20.04 LTS as to support riscv64 * Minor: Exclude idea IDE files from git --- .github/workflows/build.yaml | 2 +- .gitignore | 2 ++ README.md | 2 +- build/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d7fc6ed..439396a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ on: env: DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev - PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7 + PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64 jobs: build: diff --git a/.gitignore b/.gitignore index 722d5e7..366d839 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +# Ignoring IDE-specific files +.idea/* .vscode diff --git a/README.md b/README.md index 4c60a72..0c048b3 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ We now support ARM devices (`arm64` and `arm/v7`)! Use the images tagged with `b There are two types of images. - `deb`: Images based on the official [.deb release](https://protonmail.com/bridge/install). It only supports the `amd64` architecture. - - `build`: Images based on the [source code](https://github.com/ProtonMail/proton-bridge). It supports `amd64`, `arm64`, and `arm/v7`. Supporting to more architectures is possible. PRs are welcome. + - `build`: Images based on the [source code](https://github.com/ProtonMail/proton-bridge). It supports `amd64`, `arm64`, `arm/v7` and `riscv64`. Supporting to more architectures is possible. PRs are welcome. tag | description -- | -- diff --git a/build/Dockerfile b/build/Dockerfile index 5fd445a..73d3cf5 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /build/ COPY build.sh VERSION /build/ RUN bash build.sh -FROM ubuntu:bionic +FROM ubuntu:focal LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp From 4dbf2f806e07aa3f436ad9ef86a963249f9a6c08 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 23 Nov 2022 00:14:33 +0000 Subject: [PATCH 35/38] Bump deb version to 2.4.8-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index a472920..2207d7f 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.3.0-1 \ No newline at end of file +2.4.8-1 \ No newline at end of file From cf1e02520944d7dfd222442507374e56c5f167e3 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 26 Nov 2022 00:13:33 +0000 Subject: [PATCH 36/38] Bump deb version to 2.3.0-1 --- deb/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/VERSION b/deb/VERSION index 2207d7f..a472920 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.4.8-1 \ No newline at end of file +2.3.0-1 \ No newline at end of file From 2e3bcdef1f3ca08d047e83f8769312288df40193 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 30 Nov 2022 00:15:14 +0000 Subject: [PATCH 37/38] Bump build version to 3.0.2 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index 752a79e..d9c62ed 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -2.4.8 \ No newline at end of file +3.0.2 \ No newline at end of file From 0e92386a9395bdb19a0f97e1c13211761b4a1516 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 3 Dec 2022 00:12:21 +0000 Subject: [PATCH 38/38] Bump build version to 3.0.4 --- build/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/VERSION b/build/VERSION index d9c62ed..b38ebbf 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.0.2 \ No newline at end of file +3.0.4 \ No newline at end of file