From 07d1004e09a1c31cc5c65b84177f14fda95cfd8e Mon Sep 17 00:00:00 2001 From: Thibault Godouet Date: Sun, 25 Jul 2021 17:42:10 +0100 Subject: [PATCH] run as non-root in docker --- README.md | 6 +++--- build/Dockerfile | 7 +++++++ build/entrypoint.sh | 5 +++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 853a82d..389e6b7 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ tag | description To initialize and add account to the bridge, run the following command. ``` -docker run --rm -it -v protonmail:/root shenxn/protonmail-bridge init +docker run --rm -it -v protonmail:/home/protonmail shenxn/protonmail-bridge init ``` Wait for the bridge to startup, use `login` command and follow the instructions to add your account into the bridge. Then use `info` to see the configuration information (username and password). After that, use `exit` to exit the bridge. You may need `CTRL+C` to exit the docker entirely. @@ -48,7 +48,7 @@ Wait for the bridge to startup, use `login` command and follow the instructions To run the container, use the following command. ``` -docker run -d --name=protonmail-bridge -v protonmail:/root -p 1025:25/tcp -p 1143:143/tcp --restart=unless-stopped shenxn/protonmail-bridge +docker run -d --name=protonmail-bridge -v protonmail:/home/protonmail -p 1025:25/tcp -p 1143:143/tcp --restart=unless-stopped shenxn/protonmail-bridge ``` ## Kubernetes @@ -62,7 +62,7 @@ If you don't want to use Helm, you can also reference to the guide ([#6](https:/ Please be aware that running the command above will expose your bridge to the network. Remember to use firewall if you are going to run this in an untrusted network or on a machine that has public IP address. You can also use the following command to publish the port to only localhost, which is the same behavior as the official bridge package. ``` -docker run -d --name=protonmail-bridge -v protonmail:/root -p 127.0.0.1:1025:25/tcp -p 127.0.0.1:1143:143/tcp --restart=unless-stopped shenxn/protonmail-bridge +docker run -d --name=protonmail-bridge -v protonmail:/home/protonmail -p 127.0.0.1:1025:25/tcp -p 127.0.0.1:1143:143/tcp --restart=unless-stopped shenxn/protonmail-bridge ``` Besides, you can publish only port 25 (SMTP) if you don't need to receive any email (e.g. as a email notification service). diff --git a/build/Dockerfile b/build/Dockerfile index ae1c6f7..439e831 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -25,4 +25,11 @@ COPY gpgparams entrypoint.sh /protonmail/ # Copy protonmail COPY --from=build /build/proton-bridge/proton-bridge /protonmail/ +# Add a user 'protonmail' with UID 8535 +RUN useradd -u 8535 -d /home/protonmail protonmail \ + && mkdir -p /home/protonmail \ + && chown protonmail: /home/protonmail +# change to non-privileged user for extra security +USER protonmail + ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"] diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 1cebda6..c04cb4a 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -2,6 +2,11 @@ set -ex +id +# Go to current user's homedir +cd +echo $PWD + # Initialize if [[ $1 == init ]]; then