temp x

If you're going to build v3 you need to have Jammy, or you will get
glibc errors

.github/workflows/build.yaml

@@ -16,77 +16,123 @@ 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,linux/riscv64
 
 jobs:
-  build:
+  build-binary:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
-    services:
+    strategy:
-      registry:
+      matrix:
-        image: registry:2
+        arch: ["amd64", "arm64", "arm", "riscv64"]
-        ports:
+      fail-fast: true
-          - 5000:5000
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
+        with:
+          path: main
       - name: Set version
         id: version
-        run: echo "::set-output name=version::`cat build/VERSION`"
+        run: echo "version=`cat main/build/VERSION`" >> $GITHUB_OUTPUT
-      - name: Set repo
+      - name: Checkout proton bridge repo
-        id: repo
+        uses: actions/checkout@v3
-        run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
-      - name: Docker meta
-        id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
         with:
-          images: ${{ steps.repo.outputs.repo }}
+          repository: ProtonMail/proton-bridge
-      - name: Set up QEMU
+          ref: v${{ steps.version.outputs.version }}
-        uses: docker/setup-qemu-action@v1
+          path: proton-bridge
-      - name: Set up Docker Buildx
+      - name: Set up golang
-        uses: docker/setup-buildx-action@v1
+        uses: actions/setup-go@v3
         with:
-          driver-opts: network=host
+          go-version: 1.18
-      - name: Build image without push to registry
+          check-latest: true
-        uses: docker/build-push-action@v2
+      - name: Install dependencies
-        with:
+        run: sudo apt-get install -y --no-install-recommends build-essential libsecret-1-dev
-          context: ./build
+      - name: Download go dep
-          file: ./build/Dockerfile
+        if: ${{ matrix.arch == 'arm' }}
-          platforms: ${{ env.PLATFORMS }}
+        working-directory: proton-bridge
-          push: true
+        # Build once to download deps.
-          tags: localhost:5000/protonmail-bridge:latest
+        # This step is expected to fail.
-      - name: Scan image
+        run: make build-nogui || true
-        id: scan
+        env:
-        uses: anchore/scan-action@v2
+          GOARCH: ${{ matrix.arch }}
-        with:
+      - name: Patch for 32 bit arch
-          image: localhost:5000/protonmail-bridge:latest
+        if: ${{ matrix.arch == 'arm' }}
-          fail-build: true
+        # For 32bit architectures, there was a overflow error on the parser
-          severity-cutoff: critical
+        # This is a workaround for this problem found at:
-          acs-report-enable: true
+        #   https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106
-      - name: Upload Anchore scan SARIF report
+        run: find $(go env GOPATH)/pkg/mod/github.com/\!proton\!mail/go-rfc5322*/ -type f -exec sed -i.bak 's/(1<</(int64(1)<</g' {} +
-        uses: github/codeql-action/upload-sarif@v1
+      - name: Build binary
-        with:
+        working-directory: proton-bridge
-          sarif_file: ${{ steps.scan.outputs.sarif }}
+        run: make build-nogui
-      - name: Login to DockerHub
+        env:
-        uses: docker/login-action@v1
+          GOARCH: ${{ matrix.arch }}
-        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
+  # build:
-        with:
+  #   runs-on: ubuntu-latest
-          username: ${{ secrets.REGISTRY_USERNAME }}
+  #   services:
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+  #     registry:
-      - name: Login to GitHub Container Registry
+  #       image: registry:2
-        uses: docker/login-action@v1
+  #       ports:
-        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
+  #         - 5000:5000
-        with:
+  #   steps:
-          registry: ghcr.io
+  #     - name: Checkout
-          username: ${{ github.repository_owner }}
+  #       uses: actions/checkout@master
-          password: ${{ secrets.CR_PAT }}
+  #     - name: Set version
-      - name: Push image
+  #       id: version
-        uses: docker/build-push-action@v2
+  #       run: echo "::set-output name=version::`cat build/VERSION`"
-        with:
+  #     - name: Set repo
-          context: ./build
+  #       id: repo
-          file: ./build/Dockerfile
+  #       run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
-          platforms: ${{ env.PLATFORMS }}
+  #     - name: Docker meta
-          tags: |
+  #       id: docker_meta
-            ${{ steps.repo.outputs.repo }}:build
+  #       uses: crazy-max/ghaction-docker-meta@v1
-            ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build
+  #       with:
-          labels: ${{ steps.docker_meta.outputs.labels }}
+  #         images: ${{ steps.repo.outputs.repo }}
-          push: ${{ github.event_name != 'pull_request' }}
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v1
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v1
+  #       with:
+  #         driver-opts: network=host
+  #     - name: Build image without push to registry
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         context: ./build
+  #         file: ./build/Dockerfile
+  #         platforms: ${{ env.PLATFORMS }}
+  #         push: true
+  #         tags: localhost:5000/protonmail-bridge:latest
+  #     - name: Scan image
+  #       id: scan
+  #       uses: anchore/scan-action@v2
+  #       with:
+  #         image: localhost:5000/protonmail-bridge:latest
+  #         fail-build: true
+  #         severity-cutoff: critical
+  #         acs-report-enable: true
+  #     - name: Upload Anchore scan SARIF report
+  #       uses: github/codeql-action/upload-sarif@v1
+  #       with:
+  #         sarif_file: ${{ steps.scan.outputs.sarif }}
+  #     - name: Login to DockerHub
+  #       uses: docker/login-action@v1
+  #       if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
+  #       with:
+  #         username: ${{ secrets.REGISTRY_USERNAME }}
+  #         password: ${{ secrets.REGISTRY_PASSWORD }}
+  #     - name: Login to GitHub Container Registry
+  #       uses: docker/login-action@v1
+  #       if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
+  #       with:
+  #         registry: ghcr.io
+  #         username: ${{ github.repository_owner }}
+  #         password: ${{ secrets.CR_PAT }}
+  #     - name: Push image
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         context: ./build
+  #         file: ./build/Dockerfile
+  #         platforms: ${{ env.PLATFORMS }}
+  #         tags: |
+  #           ${{ steps.repo.outputs.repo }}:build
+  #           ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build
+  #         labels: ${{ steps.docker_meta.outputs.labels }}
+  #         push: ${{ github.event_name != 'pull_request' }}

.gitignore

@@ -0,0 +1,3 @@
+# Ignoring IDE-specific files
+.idea/*
+.vscode

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.
@@ -24,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
  -- | --

build/Dockerfile

@@ -1,14 +1,15 @@
-FROM golang:1.15 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/
 COPY build.sh VERSION /build/
 RUN bash build.sh
 
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 
 EXPOSE 25/tcp
@@ -23,6 +24,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"]

build/VERSION

@@ -1 +1 @@
-1.8.9
+3.0.9

build/build.sh

@@ -9,5 +9,15 @@ 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<</(int64(1)<</g' {} +
+fi
+
 # Build
 make build-nogui

build/entrypoint.sh

@@ -9,6 +9,12 @@ 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.
+    # 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 $@
 

build/install-golang.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ex
+
+GOLANG_VERSION=1.18.7
+
+ARCH=$(uname -m)
+if [[ $ARCH == "riscv64" ]]; then
+    # There is no official riscv64 release. Use carlosedp/riscv-bringup instead.
+    wget
+

deb/VERSION

@@ -1 +1 @@
-1.8.7-1
+2.3.0-1