Removed 0.0.0.0 bind patch

Adds CI pipelines to build and push the project to the Gitea Docker repository.

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Reviewed-on: https://git.jvalver.de/Thilawyn/protonmail-bridge-docker/pulls/1

.drone.yml

@@ -0,0 +1,57 @@
+kind: pipeline
+type: docker
+name: docker-build
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    registry: git.jvalver.de
+    username:
+      from_secret: username
+    password:
+      from_secret: password
+    repo: git.jvalver.de/thilawyn/protonmail-bridge-docker
+    dockerfile: build/Dockerfile
+    dry_run: true
+    context: build
+    autotag: true
+    compress: true
+    platform: linux/amd64
+
+trigger:
+  event:
+    exclude:
+    - tag
+  branch:
+    exclude:
+    - master
+
+
+---
+kind: pipeline
+type: docker
+name: docker-build-and-publish
+
+steps:
+- name: build-and-publish
+  image: plugins/docker
+  settings:
+    registry: git.jvalver.de
+    username:
+      from_secret: username
+    password:
+      from_secret: password
+    repo: git.jvalver.de/thilawyn/protonmail-bridge-docker
+    dockerfile: build/Dockerfile
+    context: build
+    autotag: true
+    compress: true
+    platform: linux/amd64
+
+trigger:
+  event:
+    exclude:
+    - pull_request
+  branch:
+  - master

.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,linux/riscv64
 
 jobs:
   build:

.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,14 @@
-FROM golang:1.15 AS build
+FROM golang:1.20-bookworm 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 +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"]

build/VERSION

@@ -1 +1 @@
-1.8.9
+3.4.0

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 $@
 

deb/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 
 EXPOSE 25/tcp

deb/VERSION

@@ -1 +1 @@
-1.8.7-1
+3.3.2-1

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '2.1'
+
+services:
+  protonmail-bridge:
+    image: shenxn/protonmail-bridge
+    # build:
+    #  context: ./build
+    #  dockerfile: Dockerfile
+    container_name: pm_bridge
+    ports:
+      - 1025:25/tcp
+      - 1143:143/tcp
+    restart: unless-stopped
+    stdin_open: true 
+    tty: true
+volumes:
+  protonmail:
+    name: protonmail