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

Retry build only on arm32

Browse Source
This commit is contained in:
Xiaonan Shen
2022-05-29 17:29:45 +08:00
parent 201bf1ed17
commit 5794e489e0
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -27,11 +27,11 @@ RUN curl -sSL https://github.com/krallin/tini/releases/download/v0.19.0/tini-$(d
&& chmod +x /tini && chmod +x /tini
# Copy bash scripts # Copy bash scripts
COPY gpgparams entrypoint.sh run_protonmail_bridge.sh cli.sh /protonmail/bin/ COPY gpgparams entrypoint.sh run_protonmail_bridge.sh cli.sh /protonmail/script/
RUN ln -s /protonmail/script/cli.sh /usr/local/bin/cli
# Copy protonmail # Copy protonmail
COPY --from=build /build/proton-bridge/proton-bridge /protonmail/bin COPY --from=build /build/proton-bridge/proton-bridge /usr/local/bin/
ENV PATH "/protonmail/bin:${PATH}"
VOLUME [ "/protonmail/data" ] VOLUME [ "/protonmail/data" ]
ENTRYPOINT ["/tini", "--", "/protonmail/bin/entrypoint.sh"] ENTRYPOINT ["/tini", "--", "/protonmail/script/entrypoint.sh"]

4
README.md
View File

@@ -46,9 +46,9 @@ All data are stored under `/protonmail/data`.
### CLI ### CLI
2.0 comes with a CLI to easily interact with the bridge. There is no need to modify the entrypoint, manually kill any process, or restart the container when you are done. Everything you need is to `exec` into the container and run `cli.sh`. With that, you can add, remove, list accounts and print account info. Changing the address mode of an account is currently not supported. To do so, simply delete the account and add it back again. Example: 2.0 comes with a CLI to easily interact with the bridge. There is no need to modify the entrypoint, manually kill any process, or restart the container when you are done. Everything you need is to `exec` into the container and run `cli`. With that, you can add, remove, list accounts and print account info. Changing the address mode of an account is currently not supported. To do so, simply delete the account and add it back again. Example:
``` ```
➜ docker exec -it protonmail cli.sh ➜ docker exec -it protonmail cli
CLI to interacte with Proton Bridge HTTP REST interface CLI to interacte with Proton Bridge HTTP REST interface
Available commands: Available commands:
login: Calls up the login procedure to add or connect accounts. login: Calls up the login procedure to add or connect accounts.

4
build.sh
View File

@@ -12,9 +12,7 @@ rm -rf internal/frontend/cli
cp -r /build/http_rest_frontend/cli internal/frontend/ cp -r /build/http_rest_frontend/cli internal/frontend/
# Build # Build
if ! make build-nogui ; then if (! make build-nogui) && [[ $(getconf LONG_BIT) == "32" ]]; then
dpkg --print-architecture
# If build fails it's probably because it is a 32bit # If build fails it's probably because it is a 32bit
# system and there was a overflow error on the parser # system and there was a overflow error on the parser
# This is a workaround for this problem found at: # This is a workaround for this problem found at:

2
entrypoint.sh
View File

@@ -34,4 +34,4 @@ if [ -d /protonmail/data/.config/protonmail ]; then
chown proton:proton -R /protonmail/data chown proton:proton -R /protonmail/data
fi fi
exec gosu proton:proton run_protonmail_bridge.sh "$@" exec gosu proton:proton /protonmail/script/run_protonmail_bridge.sh "$@"

2
run_protonmail_bridge.sh
View File

@@ -18,7 +18,7 @@ if [ ! -d ${GNUPG_PATH} ]; then
export GNUPGHOME=/tmp/gnupg export GNUPGHOME=/tmp/gnupg
mkdir ${GNUPGHOME} mkdir ${GNUPGHOME}
chmod 700 ${GNUPGHOME} chmod 700 ${GNUPGHOME}
gpg --generate-key --batch /protonmail/bin/gpgparams gpg --generate-key --batch /protonmail/script/gpgparams
pkill gpg-agent pkill gpg-agent
mv ${GNUPGHOME} ${GNUPG_PATH} mv ${GNUPGHOME} ${GNUPG_PATH}
export GNUPGHOME=${GNUPG_PATH} export GNUPGHOME=${GNUPG_PATH}