revert monero to root

btcpayserver · Oct 10, 2023 · 4af0f9a · 4af0f9a
1 parent 1052e9d
commit 4af0f9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Monero/0.18.2.2/linuxamd64.Dockerfile b/Monero/0.18.2.2/linuxamd64.Dockerfile
@@ -32,8 +32,7 @@ COPY ./scripts /scripts/
 RUN find /scripts/ -type f -print0 | xargs -0 chmod a+x
 
 # Create monero user
-RUN addgroup --system --gid 101 monero && \
-	adduser --system --disabled-password --uid 101 --gid 101 monero && \
+RUN adduser --system --group --disabled-password monero && \
 	mkdir -p /wallet /home/monero/.bitmonero && \
 	chown -R monero:monero /home/monero/.bitmonero && \
 	chown -R monero:monero /wallet
@@ -47,10 +46,9 @@ EXPOSE 18080
 EXPOSE 18081
 EXPOSE 18082
 
-# Set HOME environment variable
-ENV HOME /home/monero
 # Switch to user monero
 USER monero
+ENV HOME /home/monero
 
 # Add HEALTHCHECK against get_info endpoint
 HEALTHCHECK --interval=5s --timeout=3s CMD curl --fail http://localhost:18081/get_info || exit 1
diff --git a/Monero/0.18.2.2/linuxarm32v7.Dockerfile b/Monero/0.18.2.2/linuxarm32v7.Dockerfile
@@ -32,8 +32,7 @@ COPY ./scripts /scripts/
 RUN find /scripts/ -type f -print0 | xargs -0 chmod a+x
 
 # Create monero user
-RUN addgroup --system --gid 101 monero && \	
-	adduser --system --disabled-password --uid 101 --gid 101 monero && \
+RUN adduser --system --group --disabled-password monero && \
 	mkdir -p /wallet /home/monero/.bitmonero && \
 	chown -R monero:monero /home/monero/.bitmonero && \
 	chown -R monero:monero /wallet
@@ -47,11 +46,9 @@ EXPOSE 18080
 EXPOSE 18081
 EXPOSE 18082
 
-# Set HOME environment variable
-ENV HOME /home/monero
-
 # Switch to user monero
 USER monero
+ENV HOME /home/monero
 
 # Add HEALTHCHECK against get_info endpoint
 HEALTHCHECK --interval=5s --timeout=3s CMD curl --fail http://localhost:18081/get_info || exit 1
diff --git a/Monero/0.18.2.2/linuxarm64v8.Dockerfile b/Monero/0.18.2.2/linuxarm64v8.Dockerfile
@@ -32,8 +32,7 @@ COPY ./scripts /scripts/
 RUN find /scripts/ -type f -print0 | xargs -0 chmod a+x
 
 # Create monero user
-RUN addgroup --system --gid 101 monero && \
-	adduser --system --disabled-password --uid 101 --gid 101 monero && \
+RUN adduser --system --group --disabled-password monero && \
 	mkdir -p /wallet /home/monero/.bitmonero && \
 	chown -R monero:monero /home/monero/.bitmonero && \
 	chown -R monero:monero /wallet
@@ -46,12 +45,9 @@ VOLUME /wallet
 EXPOSE 18080
 EXPOSE 18081
 EXPOSE 18082
-
-# Set HOME environment variable
-ENV HOME /home/monero
-
 # Switch to user monero
 USER monero
+ENV HOME /home/monero
 
 # Add HEALTHCHECK against get_info endpoint
 HEALTHCHECK --interval=5s --timeout=3s CMD curl --fail http://localhost:18081/get_info || exit 1