Merge changelog updates

.cache/debian-base.digest

@@ -1 +1 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:6e9a0586293c4f349f59037b5f34ebc76f48a41de5ae8e06984e17404733dc93
+gitea.fithwum.tech/fithwum/debian-base@sha256:4023732c1234033dd440901f801b44288d6acd1c2d9db5918b104028dbfbc31a

.gitea/workflows/vintage-story-build-server.yml

@@ -1,4 +1,4 @@
-name: vintage-story-build-server
+name: vintage-story-build-latest
 
 on:
   push:
@@ -6,11 +6,11 @@ on:
       - main
     paths:
       - '.gitea/workflows/vintage-story-build-server.yml'
-      - 'server/Dockerfile'
-      - 'server/*.sh'
+      - 'latest/Dockerfile'
+      - 'latest/*.sh'
       - '!.cache/*'
-      - '!server/CHANGES.md'
-      - '!server/build-info.json'
+      - '!latest/CHANGES.md'
+      - '!latest/build-info.json'
   schedule:
     - cron: '5 22 * * 0'
 
@@ -21,7 +21,7 @@ env:
   IMAGE_REPO_VINTAGE_STORY: vintage-story
   IMAGE_TAG_DEBIAN: bookworm
   DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: server
+  VERSIONS: latest
 
 jobs:
   docker-prune:
@@ -144,7 +144,7 @@ jobs:
       needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
     strategy:
       matrix:
-        version: [server]
+        version: [latest]
     name: Build and Push ${{ matrix.version }}
     steps:
       - name: Checkout repo
@@ -166,10 +166,15 @@ jobs:
             exit 1
           fi
 
+      - name: Clear all build caches
+        run: |
+          docker builder prune -af || true
+          docker buildx prune -af || true
+
       - name: Build and push image
         run: |
           IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_VINTAGE_STORY:${{ matrix.version }}"
-          docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
+          docker buildx build --platform linux/amd64 --pull --no-cache --push -t "$IMAGE" "./${{ matrix.version }}"
 
   generate-changelogs:
     needs: build-vintage-story-images

build_vintage-story.sh

@@ -2,5 +2,5 @@
 # Copyright (c) 2023 fithwum
 # All rights reserved
 
-docker build --pull --rm -f "server/Dockerfile" -t gitea.fithwum.tech/fithwum/vintage-story:server "server"
+docker build --pull --rm -f "latest/Dockerfile" -t gitea.fithwum.tech/fithwum/vintage-story:latest "latest"
 docker push -a gitea.fithwum.tech/fithwum/vintage-story

latest/CHANGES.md

@@ -0,0 +1,5 @@
+## 2026-07-28T18:34:55Z
+
+- test (fithwum)
+- Merge build-info updates (fithwum)
+- Update build-info on 2026-07-28T18:27:27Z [skip ci] (fithwum)

latest/Dockerfile

@@ -8,7 +8,7 @@ ENV USERNAME=""
 ENV DOTNET_VERSION=""
 
 # URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/server/install_script.sh
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/latest/install_script.sh
 
 # Install Dependencies.
 RUN apt-get -y update && apt-get autoclean && apt-get autoremove \
@@ -19,7 +19,7 @@ RUN apt-get -y update && apt-get autoclean && apt-get autoremove \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /vs_server /vs_server/server /vs_server/data /vstemp /vstemp/files \
+RUN mkdir -p /vs_server /vs_server/server /vs_server/server/data /vstemp /vstemp/files \
 	&& chmod 777 -R /vs_server /vstemp \
 	&& chown 99:100 -R /vs_server /vstemp
 

latest/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "latest",
+  "commit": "3d8511dc08e6e8fb95dd8260c97fc88b2e1d7980",
+  "build_time": "2026-07-28T18:27:27Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/vintage-story:latest",
+  "digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:2e7cd3fb99b88787947e2dbdd8826ad31e98249f3a810b520dfcbbe77fe3697f",
+  "image_size": "410MB",
+  "image_size_bytes": 430944219
+}

latest/install_script.sh

@@ -0,0 +1,129 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+MARKER_FILE=$VS_SERVER_DIR/.setup_done
+VS_SERVER_DIR=/vs_server/server
+VS_DATA_DIR=/vs_server/server/data
+START_FILE=$VS_SERVER_DIR/server-$VS_VERSION.sh
+LOG_FILE=$VS_DATA_DIR/Logs/server-main.log
+START_FILE_2=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/latest/start.sh
+VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$VS_VERSION.tar.gz
+MS_REPO_URL=https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb
+USERNAME=adduser vintagestory
+
+# DOTnet install
+if [ $DOTNET_VERSION = "8.0" ]; then
+    echo "INFO ! dotnet-sdk-$DOTNET_VERSION Selected"
+	if [ dpkg -s dotnet-sdk-8.0 &> /dev/null ]
+	then
+		echo "INFO ! dotnet-sdk-8.0 installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! dotnet-sdk-8.0 not installed ... will install now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO_URL -O packages-microsoft-prod.deb
+		dpkg -i packages-microsoft-prod.deb
+		rm packages-microsoft-prod.deb
+		apt-get -y update
+		apt-get install -y dotnet-sdk-8.0
+	fi
+elif [ $DOTNET_VERSION = "9.0" ]; then
+    echo "INFO ! dotnet-sdk-$DOTNET_VERSION Selected"
+	if [ dpkg -s dotnet-sdk-9.0 &> /dev/null ]
+	then
+		echo "INFO ! dotnet-sdk-9.0 installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! dotnet-sdk-9.0 not installed ... will install now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO_URL -O packages-microsoft-prod.deb
+		dpkg -i packages-microsoft-prod.deb
+		rm packages-microsoft-prod.deb
+		apt-get -y update
+		apt-get install -y dotnet-sdk-9.0
+	fi
+elif [ $DOTNET_VERSION = "10.0" ]; then
+    echo "INFO ! dotnet-sdk-$DOTNET_VERSION Selected"
+	if [ dpkg -s dotnet-sdk-10.0 &> /dev/null ]
+	then
+		echo "INFO ! dotnet-sdk-10.0 installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! dotnet-sdk-10.0 not installed ... will install now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO_URL -O packages-microsoft-prod.deb
+		dpkg -i packages-microsoft-prod.deb
+		rm packages-microsoft-prod.deb
+		apt-get -y update
+		apt-get install -y dotnet-sdk-10.0
+	fi
+else
+    echo "ERROR ! Dotnet version must be set first run"
+    sleep infinity
+fi
+
+# Main install (Debian).
+# Check for server files and download if needed.
+if [ -e $START_FILE ]
+	then
+		echo " "
+		echo "INFO ! server-$VS_VERSION.sh found starting now."
+	else
+		echo " "
+		echo "WARNING ! server-$VS_VERSION.sh is out of date/missing ... will download now."
+			echo " "
+			echo "INFO ! Cleaning old files."
+			mkdir -pv $VS_SERVER_DIR/old-server-versions/
+			mv *.sh $VS_SERVER_DIR/old-server-versions/
+			rm -fr $VS_SERVER_DIR/assets $VS_SERVER_DIR/Lib $VS_SERVER_DIR/Mods
+			rm -fr $VS_SERVER_DIR/VintagestoryServer $VS_SERVER_DIR/*.dll $VS_SERVER_DIR/*.pdb $VS_SERVER_DIR/*.json $VS_SERVER_DIR/*.xml $VS_SERVER_DIR/*.txt
+			wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz
+			tar -xzf /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /vstemp/files
+			rm -fr /vstemp/*.tar.gz
+			mv -uf /vstemp/files/* $VS_SERVER_DIR/
+			mv $VS_SERVER_DIR/server.sh $START_FILE
+			chmod +x $START_FILE
+fi
+
+echo "INFO ! Setting server path."
+sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE
+echo "INFO ! Setting data path."
+sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE
+
+# Set permissions.
+chown 99:100 -R $VS_SERVER_DIR
+chmod 776 -R $VS_SERVER_DIR
+
+# Setup the server
+if [ ! -f $MARKER_FILE ]; then
+    echo "First time run: Setting up server environment..."
+    yes y | $VS_SERVER_DIR/server-1.21.5.sh setup $USERNAME $VS_DATA_DIR
+	touch $MARKER_FILE
+	echo "Setup successfully completed."
+fi
+
+# Download the start file for the screen session
+if [ -f $START_FILE_2 ]; then
+    echo "INFO ! start.sh found ... moving on."
+else
+	echo "WARNING ! start.sh missing ... downloading default file."
+    wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE_2 -O $VS_SERVER_DIR/start.sh
+	chmod +x $VS_SERVER_DIR/start.sh
+fi
+
+# Run vintage-story server.
+exec $VS_SERVER_DIR/start.sh
+
+# echo " "
+# echo "INFO ! Starting vintage-story Server $VS_VERSION"
+# .$VS_SERVER_DIR/server-$VS_VERSION.sh start
+
+# echo "Waiting for the server log file to be created..."
+# # Loop indefinitely until the log file actually exists on disk
+# until [ -f "$LOG_FILE" ]; do
+#     sleep 1
+# done
+
+# echo "Log file found! Streaming server console now..."
+# # Hand off PID 1 to tail, keeping the container active permanently
+# exec tail -f "$LOG_FILE"
+
+exit

latest/start.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2026 fithwum
+# All rights reserved
+
+LOG_FILE=/vs_server/server/data/Logs/server-main.log
+SESSION=server
+
+# cd /vs_server/server
+
+echo "INFO ! A screen session for the Vintage-Story server is already running."
+cleanup() {
+    echo "[INFO] Stopping Vintage-Story ..."
+    screen -S "$SESSION" -X $SESSION "stop$(printf '\r')"
+    # Wait up to 60 seconds
+    for i in {1..60}; do
+        if ! screen -list | grep -q "$SESSION"; then
+            break
+        fi
+        sleep 1
+    done
+    # Kill it if it's still alive
+    screen -S "$SESSION" -X quit 2>/dev/null || true
+    exit 0
+}
+trap cleanup SIGINT SIGTERM
+
+# Start the Minecraft server in a detached screen session
+echo "INFO ! Starting Vintage-Story Server in a screen session."
+touch "$LOG_FILE"
+screen -L -Logfile "$LOG_FILE" -dmS "$SESSION" bash -c dotnet /vs_server/server/VintagestoryServer.dll --data-path /vs_server/server/data
+exec tail -F "$LOG_FILE"

server/CHANGES.md

@@ -1,5 +0,0 @@
-## 2026-07-28T14:23:27Z
-
-- test (fithwum)
-- Merge build-info updates (fithwum)
-- Update build-info on 2026-07-28T14:22:40Z [skip ci] (fithwum)

server/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "server",
-  "commit": "c9503c494301224e227b0ab6d100998052fe1d50",
-  "build_time": "2026-07-28T14:23:38Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/vintage-story:server",
-  "digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:a65be1a794331206ad944f402935cb5968cb41659391fb43acfc87a517640b82",
-  "image_size": "410MB",
-  "image_size_bytes": 430942270
-}

server/install_script.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2026 fithwum
-# All rights reserved
-
-MARKER_FILE=$VS_SERVER_DIR/.setup_done
-VS_SERVER_DIR=/vs_server/server
-VS_DATA_DIR=/vs_server/data
-START_FILE=$VS_SERVER_DIR/server-$VS_VERSION.sh
-VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$VS_VERSION.tar.gz
-
-# DOTnet install
-if [ dpkg -s dotnet-sdk-$DOTNET_VERSION &> /dev/null ]
-	then
-		echo "INFO ! dotnet-sdk-$DOTNET_VERSION installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! dotnet-sdk-$DOTNET_VERSION not installed ... will install now."
-		wget --no-cache --show-progress --progress=bar:force:noscroll https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-		dpkg -i packages-microsoft-prod.deb
-		rm packages-microsoft-prod.deb
-		apt-get -y update
-		apt-get install -y dotnet-sdk-$DOTNET_VERSION
-fi
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $START_FILE ]
-	then
-		echo " "
-		echo "INFO ! server-$VS_VERSION.sh found starting now."
-	else
-		echo " "
-		echo "WARNING ! server-$VS_VERSION.sh is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir -pv $VS_SERVER_DIR/old-server-versions/
-			mv *.sh $VS_SERVER_DIR/old-server-versions/
-			rm -fr $VS_SERVER_DIR/assets $VS_SERVER_DIR/Lib $VS_SERVER_DIR/Mods
-			rm -fr $VS_SERVER_DIR/VintagestoryServer $VS_SERVER_DIR/*.dll $VS_SERVER_DIR/*.pdb $VS_SERVER_DIR/*.json $VS_SERVER_DIR/*.xml $VS_SERVER_DIR/*.txt
-			wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz
-			tar -xzf /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /vstemp/files
-			rm -fr /vstemp/*.tar.gz
-			mv -uf /vstemp/files/* $VS_SERVER_DIR/
-			mv $VS_SERVER_DIR/server.sh $START_FILE
-			chmod +x $START_FILE
-fi
-
-echo "INFO ! Setting server path."
-sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE
-echo "INFO ! Setting data path."
-sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE
-echo "INFO ! Setting username."
-sed -i -E "s|^USERNAME='vintagestory'|USERNAME='$USERNAME'|" $START_FILE
-
-# Set permissions.
-chown 99:100 -R /vs_server
-chmod 776 -R /vs_server
-
-# Setup the server
-if [ ! -f $MARKER_FILE ]; then
-    echo "First time run: Setting up server environment..."
-    yes y | $VS_SERVER_DIR/server-1.21.5.sh setup $USERNAME $VS_SERVER_DIR && touch $MARKER_FILE
-	echo "Setup successfully completed."
-fi
-
-# Run vintage-story server.
-echo " "
-echo "INFO ! Starting vintage-story Server $VS_VERSION"
-exec $VS_SERVER_DIR/server-$VS_VERSION.sh start
-
-exit

vintage-story_server_unraid.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<Container version="2">
-  <Name>Vintage-Story</Name>
-  <Repository>gitea.fithwum.tech/fithwum/vintage-story:server</Repository>
-  <Registry>https://hub.docker.com/r/fithwum/vintage-story/</Registry>
-  <Network>host</Network>
-  <MyIP/>
-  <Shell>sh</Shell>
-  <Privileged>false</Privileged>
-  <Support>https://forums.unraid.net/topic/125134-support-fithwum-vintage-story-server/</Support>
-  <Project>https://www.vintagestory.at</Project>
-  <ReadMe/>
-  <Overview>This docker will run a Vintage-Story server.</Overview>
-  <Category>GameServers:</Category>
-  <WebUI/>
-  <TemplateURL>https://github.com/fithwum/files-for-dockers/templates/vintage-story_server_unraid.xml</TemplateURL>
-  <Icon>https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/icons/vintage-story.png</Icon>
-  <ExtraParams/>
-  <PostArgs/>
-  <CPUset/>
-  <DateInstalled>1784389857</DateInstalled>
-  <DonateText>Buy me a coffee if you like.</DonateText>
-  <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
-  <Requires/>
-  <Config Name="Vintage Story Release Channel" Target="VS_CHANNEL" Default="stable|unstable" Mode="" Description="Select which release channel you want to use." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="vintage-story Version" Target="VS_VERSION" Default="" Mode="" Description="Pick your vintage-story version." Type="Variable" Display="always" Required="true" Mask="false">1.21.5</Config>
-  <Config Name="Username" Target="USERNAME" Default="vintagestory" Mode="" Description="Set username." Type="Variable" Display="always" Required="true" Mask="false">fithwum</Config>
-  <Config Name="Dotnet Version" Target="DOTNET_VERSION" Default="8.0|9.0|10.0" Mode="" Description="Select Dotnet version." Type="Variable" Display="always" Required="true" Mask="false"></Config>
-  <Config Name="Save Data" Target="/VSserver/data/" Default="" Mode="rw" Description="Save data path" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/Games/Saves/vintagestory/</Config>
-  <Config Name="AppData Config Path" Target="/VSserver/server" Default="/mnt/user/appdata/vintage-story-server" Mode="rw" Description="Appdata path" Type="Path" Display="advanced-hide" Required="true" Mask="false">/mnt/user/Games/Servers/vintage-story-server</Config>
-  <Config Name="Key 2" Target="PUID" Default="99" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">99</Config>
-  <Config Name="Key 3" Target="PGID" Default="100" Mode="" Description="" Type="Variable" Display="advanced-hide" Required="false" Mask="false">100</Config>
-  <TailscaleStateDir/>
-</Container>