From 0c9c9a4eb1ec01ab0c678e0fd59ca9a28d8792fa Mon Sep 17 00:00:00 2001
From: norimicry <stuff.github@eris.cc>
Date: Tue, 7 Apr 2020 04:40:06 +0200
Subject: [PATCH] now running as user

---
 docker-compose.yml          | 12 +++++-------
 docker/Dockerfile           |  5 +++--
 docker/docker-entrypoint.sh |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 337f012..306c2ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,14 @@ version: '2.2'
 services:
   valley:
     build: docker
+    container_name: stardew
     ports:
       - 5902:5900
       - 24642:24642/udp
     volumes:
-      - ./asound.conf:/etc/asound.conf
       - ./config:/root/.config/i3/config
-      - ./valley_saves:/root/.config/StardewValley/Saves/
-      - ./configs/alwayson.json:/data/Stardew/Stardew\ Valley/Mods/Always\ On\ Server/config.json
-      - ./configs/unlimitedplayers.json:/data/Stardew/Stardew\ Valley/Mods/UnlimitedPlayers/config.json
-      - ./configs/autoload.json:/data/Stardew/Stardew\ Valley/Mods/AutoLoadGame/config.json
-    devices:
-      - /dev/snd:/dev/snd
+      - ./valley_saves:/home/nya/.config/StardewValley/Saves/
+      - ./configs/alwayson.json:/data/Stardew/Stardew Valley/Mods/Always On Server/config.json
+      - ./configs/unlimitedplayers.json:/data/Stardew/Stardew Valley/Mods/UnlimitedPlayers/config.json
+      - ./configs/autoload.json:/data/Stardew/Stardew Valley/Mods/AutoLoadGame/config.json
       
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 804bb74..344083a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN mkdir -p /data/Stardew && \
     rm /data/latest.tar.gz && \
     wget https://github.com/Pathoschild/SMAPI/releases/download/3.4.1/SMAPI-3.4.1-installer.zip  -qO /data/nexus.zip && \
     unzip /data/nexus.zip -d /data/nexus/ && \
-    /bin/bash -c "echo -e \"2\n/data/Stardew/Stardew\ Valley\n1\n\" | /usr/bin/mono /data/nexus/SMAPI\ 3.4.1\ installer/internal/unix-install.exe"
+    /bin/bash -c "echo -e \"2\n/data/Stardew/Stardew\ Valley\n1\n\" | /usr/bin/mono /data/nexus/SMAPI\ 3.4.1\ installer/internal/unix-install.exe" 
 
 # Add Mods
 COPY mods/alwayson.zip /data/alwayson.zip
@@ -22,7 +22,8 @@ RUN unzip /data/alwayson.zip -d /data/Stardew/Stardew\ Valley/Mods && \
     unzip /data/unlimitedplayers.zip -d /data/Stardew/Stardew\ Valley/Mods && \
     unzip /data/autoloadgame.zip -d /data/Stardew/Stardew\ Valley/Mods && \
     rm /data/alwayson.zip /data/unlimitedplayers.zip /data/autoloadgame.zip
-
+RUN chown -R 1010:1010 /data && chmod +x /data/Stardew/Stardew\ Valley/StardewValley && useradd -m -u 1010 nya
+USER nya
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index d0c9323..df4ed89 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
+if [ -f /tmp/.X10-lock ]; then rm /tmp/.X10-lock; fi
 Xvfb :10 -screen 0 1580x920x24 -ac &
 export DISPLAY=:10.0
 x11vnc -display :10 -rfbport 5900 -rfbportv6 -1 -no6 -noipv6 -httpportv6 -1 -forever -desktop StardewValley -cursor arrow -shared -passwd 23eris42 & 
 sleep 5
 i3 &
-chmod +x /data/Stardew/Stardew\ Valley/StardewValley
-
+export XAUTHORITY=~/.Xauthority
 TERM=xterm
 /data/Stardew/Stardew\ Valley/StardewValley