From fb3f7a32ef03798d571251edf8253cedf714363d Mon Sep 17 00:00:00 2001
From: norimicry <stuff.github@eris.cc>
Date: Tue, 7 Apr 2020 05:20:53 +0200
Subject: [PATCH] user folder bugfixes

---
 docker-compose.yml          | 4 +++-
 docker/Dockerfile           | 2 +-
 docker/docker-entrypoint.sh | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 306c2ad..417697d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,11 +4,13 @@ services:
   valley:
     build: docker
     container_name: stardew
+    environment:
+      - VNCPASS=nyanyanya
     ports:
       - 5902:5900
       - 24642:24642/udp
     volumes:
-      - ./config:/root/.config/i3/config
+      - ./config:/home/nya/.config/i3/config
       - ./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
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 344083a..68549ce 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ 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
+RUN chown -R 1010:1010 /data && mkdir -p /home/nya/.config/StardewValley && chown -R 1010:1010 /home/nya/.config/StardewValley/ && chmod +x /data/Stardew/Stardew\ Valley/StardewValley && useradd -m -u 1010 nya
 USER nya
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index df4ed89..bd6835c 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -2,8 +2,8 @@
 
 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 & 
+export DISPLAY=:10
+x11vnc -display :10 -rfbport 5900 -rfbportv6 -1 -no6 -noipv6 -httpportv6 -1 -forever -desktop StardewValley -cursor arrow -passwd $VNCPASS -shared & 
 sleep 5
 i3 &
 export XAUTHORITY=~/.Xauthority