switch to non-root user in container

README.md

@@ -8,6 +8,7 @@ Stuff that's deployed on [matthewtran.com](matthewtran.com). Tested on Ubuntu Se
 - p2pool (`xmrig -o matthewtran.com:3333`)
 - minecraft
 - terraria
+- wireguard
 
 ## setup
 

compose.yml

@@ -2,25 +2,35 @@ services:
   monerod:
     restart: always
     build: monerod/.
-    entrypoint: ["/bin/sh", "/root/entry.sh"]
+    entrypoint: ["/bin/sh", "/home/matt/entry.sh"]
     ports:
       - "18080:18080"
       - "18083:18083"
     volumes:
-      - ./monerod/.bitmonero:/root/.bitmonero
+      - ./monerod/.bitmonero:/home/matt/.bitmonero
+  p2pool:
+    restart: always
+    build: p2pool/.
+    # entrypoint: ["/bin/sh", "/home/matt/entry.sh"]
+    ports:
+      - "3333:3333"
+      - "37888:37888"
+      - "37889:37889"
+    # volumes:
+    #   - ./monerod/.bitmonero:/home/matt/.bitmonero
   minecraft:
     restart: always
     build: minecraft/.
-    entrypoint: ["/bin/sh", "/root/entry.sh"]
+    entrypoint: ["/bin/sh", "/home/matt/entry.sh"]
     ports:
       - "25565:25565"
     volumes:
-      - ./minecraft/world:/root/world
+      - ./minecraft/world:/home/matt/world
   terraria:
     restart: always
     build: terraria/.
-    entrypoint: ["/bin/sh", "/root/entry.sh"]
+    entrypoint: ["/bin/sh", "/home/matt/entry.sh"]
     ports:
       - "7777:7777"
     volumes:
-      - ./terraria/worlds:/root/worlds
+      - ./terraria/worlds:/home/matt/worlds

minecraft/.dockerignore

@@ -0,0 +1 @@
+world/

minecraft/Dockerfile

@@ -1,17 +1,19 @@
 FROM ubuntu:22.04
 
-WORKDIR /root
-
 RUN apt-get update && apt-get upgrade
 RUN apt-get install -y wget openjdk-18-jre
 
+RUN useradd -m matt
+USER matt
+WORKDIR /home/matt
+
 RUN wget https://github.com/Tiiffi/mcrcon/releases/download/v0.7.2/mcrcon-0.7.2-linux-x86-64.tar.gz
 RUN tar xvf mcrcon-0.7.2-linux-x86-64.tar.gz
 
 # from https://www.minecraft.net/en-us/download/server (currently 1.20.1)
 RUN wget https://piston-data.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar
 
-COPY eula.txt ./
-COPY entry.sh ./
-COPY server.properties ./
-COPY ops.json ./
+COPY --chown=matt:matt eula.txt ./
+COPY --chown=matt:matt entry.sh ./
+COPY --chown=matt:matt server.properties ./
+COPY --chown=matt:matt ops.json ./

monerod/.dockerignore

@@ -0,0 +1 @@
+.bitmonero

monerod/Dockerfile

@@ -1,12 +1,14 @@
 FROM ubuntu:22.04
 
-WORKDIR /root
-
 RUN apt-get update && apt-get upgrade
 RUN apt-get install -y wget bzip2
 
+RUN useradd -m matt
+USER matt
+WORKDIR /home/matt
+
 RUN wget https://downloads.getmonero.org/linux64
 RUN tar xvf linux64 && rm linux64
 RUN mv monero-x86_64-linux-gnu-v0.18.2.2/ monero/
 
-COPY entry.sh ./
+COPY --chown=matt:matt entry.sh ./

p2pool/Dockerfile

@@ -0,0 +1,9 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && apt-get upgrade
+
+RUN useradd -m matt
+USER matt
+WORKDIR /home/matt
+
+# TODO everything else

terraria/.dockerignore

@@ -0,0 +1 @@
+worlds/

terraria/Dockerfile

@@ -1,19 +1,21 @@
 FROM ubuntu:22.04
 
-WORKDIR /root
-
 RUN apt-get update && apt-get upgrade
 RUN apt-get install -y wget unzip
 
+RUN useradd -m matt
+USER matt
+WORKDIR /home/matt
+
 # from https://terraria.fandom.com/wiki/Server (currently 1.4.4.9)
 RUN wget https://terraria.org/api/download/pc-dedicated-server/terraria-server-1449.zip
 RUN unzip terraria-server-1449.zip && rm terraria-server-1449.zip
 RUN mv 1449/ server/
 
-COPY entry.sh ./
+COPY --chown=matt:matt entry.sh ./
 
-WORKDIR /root/server/Linux
+WORKDIR /home/matt/server/Linux
 
 RUN chmod +x TerrariaServer.bin.x86_64
-COPY password.default ./password.txt
-COPY config.txt password.tx[t] ./
+COPY --chown=matt:matt password.default ./password.txt
+COPY --chown=matt:matt config.txt password.tx[t] ./

terraria/config.txt

@@ -1,5 +1,5 @@
-world=/root/worlds/default.wld
+world=/home/matt/worlds/default.wld
 autocreate=3
 worldname=default
 difficulty=2
-worldpath=/root/worlds
+worldpath=/home/matt/worlds