remove armv7 workaround

This commit is contained in:
Cyb3r-Jak3 2024-09-30 19:57:00 -04:00
parent abe52a9cfd
commit 439a428a5f
No known key found for this signature in database
3 changed files with 1 additions and 35 deletions

View File

@ -30,30 +30,6 @@ LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
EXPOSE 25/tcp EXPOSE 25/tcp
EXPOSE 143/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 bash scripts
COPY gpgparams entrypoint.sh /protonmail/ COPY gpgparams entrypoint.sh /protonmail/

View File

@ -1 +1 @@
3.13.0 3.14.0

View File

@ -9,15 +9,5 @@ git clone https://github.com/ProtonMail/proton-bridge.git
cd proton-bridge cd proton-bridge
git checkout v"$VERSION" 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 # Build
make build-nogui make build-nogui