diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 439396a..cb20661 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,10 +8,13 @@ on: paths: - .github/workflows/build.yaml - build/* + - deb/* pull_request: paths: - .github/workflows/build.yaml - build/* + - deb/* + workflow_dispatch: env: DOCKER_REPO: shenxn/protonmail-bridge diff --git a/build/Dockerfile b/build/Dockerfile index d2b0200..c90d696 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,3 +1,4 @@ +# The build image could be golang, but it currently does not support riscv64. Only debian:sid does, at the time of writing. FROM debian:sid-slim AS build # Install dependencies @@ -9,7 +10,7 @@ COPY build.sh VERSION /build/ RUN bash build.sh FROM debian:sid-slim -LABEL maintainer="Xiaonan Shen " +LABEL maintainer="Simon Felding " # These are only exported if running as root EXPOSE 25/tcp diff --git a/build/VERSION b/build/VERSION index 4bcbd94..209f579 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.15.0 \ No newline at end of file +3.19.0 \ No newline at end of file diff --git a/build/build.sh b/build/build.sh index 7b45e05..0b27550 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<" # These are only exported if running as root @@ -13,6 +13,13 @@ WORKDIR /protonmail # Copy bash scripts COPY gpgparams install.sh entrypoint.sh VERSION /protonmail/ +RUN apt-get update \ + && apt-get install -y --no-install-recommends socat pass procps libsecret-1-0 ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# Copy bash scripts +COPY gpgparams entrypoint.sh /protonmail/ + # Install dependencies and protonmail bridge RUN bash install.sh diff --git a/deb/VERSION b/deb/VERSION index 8529945..e177934 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -3.15.0-1 \ No newline at end of file +3.19.0-1 \ No newline at end of file