Thilawyn/protonmail-bridge-docker
1
0
Fork 0
forked from mirrors/protonmail-bridge-docker
Code Pull Requests Activity

Patch for 32 bit build

Browse Source
This commit is contained in:
Xiaonan Shen
2022-05-04 18:29:48 +08:00
parent 46b3cf35a4
commit dbb734eae8
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yaml vendored
View File

@@ -1,4 +1,4 @@
name: build from source name: Build docker image
on: on:
push: push:

2
Dockerfile
View File

@@ -17,7 +17,7 @@ EXPOSE 143/tcp
# Install dependencies and protonmail bridge # Install dependencies and protonmail bridge
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates dbus \ && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates dbus-x11 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Copy bash scripts # Copy bash scripts

20
build.sh
View File

@@ -15,17 +15,11 @@ ls /build
rm -rf internal/frontend/cli rm -rf internal/frontend/cli
cp -r /build/http_rest_frontend/cli internal/frontend/cli cp -r /build/http_rest_frontend/cli internal/frontend/cli
# Build # Workaround for 32bit build. More details can be found in:
if ! make build-nogui ; then # https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106
# If build fails it's probably because it is a 32bit if [[ $(uname -m) == "armv7l" ]]; then
# system and there was a overflow error on the parser find $(go env GOPATH)/pkg/mod/github.com/\!proton\!mail/go-rfc5322*/ -type f -exec sed -i.bak 's/(1<</(int64(1)<</g' {} +
# 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' {} +
# Try again after implementing the workaround
# make build-nogui
uname -m
exit 1
fi fi
# Build
make build-nogui