From c0e1647b7b0317d08f96e1554f0ab25f67ba41f2 Mon Sep 17 00:00:00 2001
From: status404 <temp@mailchuck.com>
Date: Wed, 19 Jul 2023 18:26:43 +0300
Subject: [PATCH] Docker fix

---
 {Docker => docker}/Dockerfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
 rename {Docker => docker}/Dockerfile (70%)

diff --git a/Docker/Dockerfile b/docker/Dockerfile
similarity index 70%
rename from Docker/Dockerfile
rename to docker/Dockerfile
index 3946c0c..a444c0b 100644
--- a/Docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,24 +48,24 @@ RUN addgroup --gid $USER_GID bitmessage ;\
 	useradd --uid $USER_UID --gid $USER_GID -m -d $HOME bitmessage
 
 WORKDIR ${HOME}
-USER bitmessage
 
 # Generate default config
 RUN pybitmessage -t
 
 # Setup environment
-CMD cat keys.dat | \
-	sed -e "s|\(apiinterface = \).*|\10\.0\.0\.0|g" \
-        	#-e "s|\(apivariant = \).*|\1json|g" \
-        	-e "s|\(apiusername = \).*|\1$BITMESSAGE_API_USER|g" \
-        	-e "s|\(apipassword = \).*|\1$BITMESSAGE_API_PASSWORD|g" \
-        	-e "s|\(apiport = \).*|\1$BITMESSAGE_API_PORT|g" \
-        	-e "s|\(apienabled = \).*|\1True|g" \
-        	-e "s|\(ttl = \).*|\1$BITMESSAGE_TTL|g" \
-        	-e "s|\(stopresendingafterxdays = \).*|\1$BITMESSAGE_STOPRESENDINGAFTERXDAYS|g" \
-        	-e "s|\(udp = \).*|\1False|g" | \
-	sponge keys.dat && \
-	exec pybitmessage -d
+CMD chown bitmessage:bitmessage keys.dat; chmod 600 keys.dat; \
+  cat keys.dat | \
+	  sed -e "s|\(apiinterface = \).*|\10\.0\.0\.0|g" \
+          	#-e "s|\(apivariant = \).*|\1json|g" \
+          	-e "s|\(apiusername = \).*|\1$BITMESSAGE_API_USER|g" \
+          	-e "s|\(apipassword = \).*|\1$BITMESSAGE_API_PASSWORD|g" \
+          	-e "s|\(apiport = \).*|\1$BITMESSAGE_API_PORT|g" \
+          	-e "s|\(apienabled = \).*|\1True|g" \
+          	-e "s|\(ttl = \).*|\1$BITMESSAGE_TTL|g" \
+          	-e "s|\(stopresendingafterxdays = \).*|\1$BITMESSAGE_STOPRESENDINGAFTERXDAYS|g" \
+          	-e "s|\(udp = \).*|\1False|g" | \
+	    sponge keys.dat && \
+	su bitmessage -c "exec pybitmessage -d"
 
 # Generate Deterministic address
 HEALTHCHECK --retries=3 --interval=15s \