diff --git a/.gitignore b/.gitignore index 229981a..cd004f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .cache *.py[cod] __pycache__/ +.env \ No newline at end of file diff --git a/1.14.5/bullseye/entrypoint.py b/1.14.5/bullseye/entrypoint.py index 79b7460..6eb002c 100755 --- a/1.14.5/bullseye/entrypoint.py +++ b/1.14.5/bullseye/entrypoint.py @@ -4,6 +4,7 @@ """ import argparse import os +import pwd # import pwd import shutil import sys @@ -134,9 +135,9 @@ def run_executable(executable, executable_args): #Switch process from root to user. #Equivalent to use gosu or su-exec - # user_info = pwd.getpwnam(os.environ['USER']) - # os.setgid(user_info.pw_gid) - # os.setuid(user_info.pw_uid) + user_info = pwd.getpwnam(os.environ['USER']) + os.setgid(user_info.pw_gid) + os.setuid(user_info.pw_uid) #Run container command return execute(executable, executable_args) diff --git a/1.14.6/bullseye/entrypoint.py b/1.14.6/bullseye/entrypoint.py index 79b7460..6eb002c 100755 --- a/1.14.6/bullseye/entrypoint.py +++ b/1.14.6/bullseye/entrypoint.py @@ -4,6 +4,7 @@ """ import argparse import os +import pwd # import pwd import shutil import sys @@ -134,9 +135,9 @@ def run_executable(executable, executable_args): #Switch process from root to user. #Equivalent to use gosu or su-exec - # user_info = pwd.getpwnam(os.environ['USER']) - # os.setgid(user_info.pw_gid) - # os.setuid(user_info.pw_uid) + user_info = pwd.getpwnam(os.environ['USER']) + os.setgid(user_info.pw_gid) + os.setuid(user_info.pw_uid) #Run container command return execute(executable, executable_args) diff --git a/1.14.7/bullseye/.env b/1.14.7/bullseye/.env deleted file mode 100644 index 20b2f12..0000000 --- a/1.14.7/bullseye/.env +++ /dev/null @@ -1,12 +0,0 @@ -daemon=1 -server=1 -listen=1 -wallet=1 -bind=0.0.0.0:22556 -bind=[::]:22556 -rpcbind=127.0.0.1:22555 -rpcallowip=0.0.0.0/0 -rpcuser=dogecoin -rpcauth=dogecoin:a1300ebb8da7f280ad66b969264c22dd$0c9869c90bfc813708540a13146c63823463ee51b5d3d6abceb11674b5eb600a -rpcpassword=jdjKm44i1UpmTicidJiaSNmUc-klDlervv_U-8uInp4 -harddustlimit=0.001 diff --git a/1.14.7/bullseye/build.sh b/1.14.7/bullseye/build.sh index dc74dae..c92c2a8 100755 --- a/1.14.7/bullseye/build.sh +++ b/1.14.7/bullseye/build.sh @@ -17,8 +17,9 @@ echo rpcuser=dogecoin >> dogecoin.conf echo $rpcauth >> dogecoin.conf echo rpcpassword=$rpcpassword >> dogecoin.conf echo harddustlimit=0.001 >> dogecoin.conf -echo reindex=1 -echo txindex=1 +echo reindex=1 >> dogecoin.conf +echo txindex=1 >> dogecoin.conf +echo prune=2000 >> dogecoin.conf cat dogecoin.conf > .env docker build --no-cache --build-arg "APP_UID=$(id -u $USER)" --build-arg "APP_GID=$(id -g $USER)" --build-arg "USER=dogecoin" -t xanimo/dogecoin:1.14.7 . diff --git a/1.14.7/bullseye/docker-compose.yml b/1.14.7/bullseye/docker-compose.yml index 956d7d2..ca3ed3a 100644 --- a/1.14.7/bullseye/docker-compose.yml +++ b/1.14.7/bullseye/docker-compose.yml @@ -9,6 +9,7 @@ services: - dogecoin:/home/dogecoin/.dogecoin env_file: - .env + command: volumes: dogecoin: @@ -16,4 +17,4 @@ volumes: driver_opts: o: bind type: none - device: /mnt/volumes/.dogecoin \ No newline at end of file + device: /mnt/volumes/.dogecoin diff --git a/1.14.7/bullseye/entrypoint.py b/1.14.7/bullseye/entrypoint.py index 79b7460..6eb002c 100755 --- a/1.14.7/bullseye/entrypoint.py +++ b/1.14.7/bullseye/entrypoint.py @@ -4,6 +4,7 @@ """ import argparse import os +import pwd # import pwd import shutil import sys @@ -134,9 +135,9 @@ def run_executable(executable, executable_args): #Switch process from root to user. #Equivalent to use gosu or su-exec - # user_info = pwd.getpwnam(os.environ['USER']) - # os.setgid(user_info.pw_gid) - # os.setuid(user_info.pw_uid) + user_info = pwd.getpwnam(os.environ['USER']) + os.setgid(user_info.pw_gid) + os.setuid(user_info.pw_uid) #Run container command return execute(executable, executable_args)