Merge 1d47123 into 72e5615

dowjones · Feb 28, 2023 · 42755f8 · 42755f8
2 parents 72e5615 + 1d47123
commit 42755f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,3 +6,4 @@
 !LICENSE.txt
 !README.md
 !tokendito/*.py
+!docker-entrypoint.sh
diff --git a/Dockerfile b/Dockerfile
@@ -14,6 +14,5 @@ WORKDIR /app
 
 # Creates a non-root user with an explicit UID and adds permission to access the /app folder
 RUN adduser -u 5678 --disabled-password --gecos "" tokendito && chown -R tokendito /app
-USER tokendito
 
-ENTRYPOINT ["python", "tokendito/tokendito.py"]
+ENTRYPOINT [ "/app/docker-entrypoint.sh" ]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/ash -e
+
+files="/home/tokendito/.aws/config /home/tokendito/.aws/credentials /home/tokendito/.config/tokendito/tokendito.ini"
+stat -c "chown %u:%g %n" $files > /tmp/$$.restore
+chown tokendito:tokendito $files
+su tokendito -c "python tokendito/tokendito.py $*"
+. /tmp/$$.restore