sr2/protonmail-bridge-docker
5
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages 1 Wiki Activity Actions

add friendly error messages for when the container hasn't been initialized properly.

Browse source
This commit is contained in:
Simon Ungar Felding 2024-12-06 14:43:17 +01:00
parent 5368a237f5
commit b62e01689c
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build/entrypoint.sh
View file

@ -22,6 +22,13 @@ else
# delete lock files if they exist - this can happen if the container is restarted forcefully # delete lock files if they exist - this can happen if the container is restarted forcefully
find $HOME -name "*.lock" -delete find $HOME -name "*.lock" -delete
# give friendly error if you don't have protonmail data
find $HOME | grep -q . || echo "No files found - start the container with the init command, or copy/mount files into it at $HOME first. Sleeping 5 minutes before exiting so you have time to copy the files over." && sleep 300 && exit 1
# give friendly error if the user doesn't own the data
if [[ $(id -u) != 0 ]]; then
find $HOME -not -user $(id -u) | grep -q . || echo "You do not own the data in $HOME. Please chown it to $(id -u), run the container as the owner of the data or run the container as root." && exit 1
fi
# socat will make the conn appear to come from 127.0.0.1 # socat will make the conn appear to come from 127.0.0.1
# ProtonMail Bridge currently expects that. # ProtonMail Bridge currently expects that.
# It also allows us to bind to the real ports :) # It also allows us to bind to the real ports :)

7
deb/entrypoint.sh
View file

@ -37,6 +37,13 @@ else
# delete lock files if they exist - this can happen if the container is restarted forcefully # delete lock files if they exist - this can happen if the container is restarted forcefully
find $HOME -name "*.lock" -delete find $HOME -name "*.lock" -delete
# give friendly error if you don't have protonmail data
find $HOME | grep -q . || echo "No files found - start the container with the init command, or copy/mount files into it at $HOME first. Sleeping 5 minutes before exiting so you have time to copy the files over." && sleep 300 && exit 1
# give friendly error if the user doesn't own the data
if [[ $(id -u) != 0 ]]; then
find $HOME -not -user $(id -u) | grep -q . || echo "You do not own the data in $HOME. Please chown it to $(id -u), run the container as the owner of the data or run the container as root." && exit 1
fi
# socat will make the conn appear to come from 127.0.0.1 # socat will make the conn appear to come from 127.0.0.1
# ProtonMail Bridge currently expects that. # ProtonMail Bridge currently expects that.
# It also allows us to bind to the real ports :) # It also allows us to bind to the real ports :)