Merge branch 'next' into master

This commit is contained in:
Xiaonan Shen 2021-09-04 11:15:36 +08:00 committed by GitHub
commit 6fd883204d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 5 deletions

View file

@ -28,4 +28,11 @@ COPY gpgparams entrypoint.sh login.exp /protonmail/
RUN chmod +x /protonmail/login.exp
# 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"]

View file

@ -1 +1 @@
1.8.3
1.8.9

View file

@ -2,6 +2,11 @@
set -ex
id
# Go to current user's homedir
cd
echo $PWD
# Initialize
if [[ $1 == init ]]; then
# set GNUPGHOME as a workaround for