diff --git a/build/Dockerfile b/build/Dockerfile index e7151c1..644b32e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -30,30 +30,6 @@ LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp EXPOSE 143/tcp -# Install dependencies and protonmail bridge -# RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ -# --mount=target=/var/cache/apt,type=cache,sharing=locked \ -# rm -f /etc/apt/apt.conf.d/docker-clean \ -# && apt-get update \ -# && apt-get -y --no-install-recommends install \ -# libc6 socat pass libsecret-1-0 ca-certificates - -# RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ -# --mount=target=/var/cache/apt,type=cache,sharing=locked \ -# rm -f /etc/apt/apt.conf.d/docker-clean \ -# && apt-get update \ -# && apt-get upgrade -y \ -# && apt-get -y --no-install-recommends install \ -# libc6 \ -# socat \ -# pass \ -# ca-certificates \ -# wget \ -# binutils \ -# xz-utils \ -# libsecret-1-dev \ -# libgl1 - # Copy bash scripts COPY gpgparams entrypoint.sh /protonmail/ diff --git a/build/VERSION b/build/VERSION index 77fdc6b..12566ed 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.13.0 \ No newline at end of file +3.14.0 \ No newline at end of file diff --git a/build/build.sh b/build/build.sh index 46017b8..3c6b991 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<