diff --git a/docker-compose.yml b/docker-compose.yml index 417697d..2f37eec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,8 +10,8 @@ services: - 5902:5900 - 24642:24642/udp volumes: - - ./config:/home/nya/.config/i3/config - - ./valley_saves:/home/nya/.config/StardewValley/Saves/ + - ./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 diff --git a/docker/Dockerfile b/docker/Dockerfile index 68549ce..ea55791 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,8 +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 && 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 +RUN chmod +x /data/Stardew/Stardew\ Valley/StardewValley COPY docker-entrypoint.sh /docker-entrypoint.sh ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index bd6835c..a7dc147 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -2,7 +2,7 @@ if [ -f /tmp/.X10-lock ]; then rm /tmp/.X10-lock; fi Xvfb :10 -screen 0 1580x920x24 -ac & -export DISPLAY=:10 +export DISPLAY=:10.0 x11vnc -display :10 -rfbport 5900 -rfbportv6 -1 -no6 -noipv6 -httpportv6 -1 -forever -desktop StardewValley -cursor arrow -passwd $VNCPASS -shared & sleep 5 i3 &