remove socat proxy commands

build/Dockerfile

@@ -12,21 +12,20 @@ RUN apt-get update && apt-get install -y \
 # Build
 ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/
 WORKDIR /build/
-RUN make build-nogui vault-editor
+RUN sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
-
+RUN set -eux; \
-COPY build.sh /build/
+    make build-nogui vault-editor
-RUN bash build.sh
 
 FROM ubuntu:latest
 LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 
-EXPOSE 25/tcp
+EXPOSE 1025/tcp
-EXPOSE 143/tcp
+EXPOSE 1143/tcp
 
 # Install dependencies and protonmail bridge
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        socat pass libsecret-1-0 ca-certificates libfido2-1 \
+        pass libsecret-1-0 ca-certificates libfido2-1 \
         dbus dbus-x11 gnupg2 \
     && rm -rf /var/lib/apt/lists/*
 

build/build.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Clone new code
-sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
-
-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

@@ -21,12 +21,6 @@ if [[ $1 == init ]]; then
 else
     eval "$(dbus-launch --sh-syntax --exit-with-session)"
 
-    # socat will make the conn appear to come from 127.0.0.1
-    # ProtonMail Bridge currently expects that.
-    # It also allows us to bind to the real ports :)
-    socat TCP-LISTEN:25,fork TCP:127.0.0.1:1025 &
-    socat TCP-LISTEN:143,fork TCP:127.0.0.1:1143 &
-
     # Start protonmail
     # Fake a terminal, so it does not quit because of EOF...
     rm -f faketty