Compare commits
59
Commits
791e9b7c48
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
905ae6d539 | ||
|
|
a596e5dbd4 | ||
|
|
97d139b01a | ||
|
|
57ed2bbff4 | ||
|
|
c4687dce6a | ||
|
|
983e5d98d8 | ||
|
|
189cd8106b | ||
|
|
992f646b1e | ||
|
|
d452101164 | ||
|
|
698dc94bb6 | ||
|
|
7f3f010574 | ||
|
|
89bb1c5ec4 | ||
|
|
057d7761ef | ||
|
|
cd1d9d70ce | ||
|
|
81562d7d0d | ||
|
|
c5f276cc59 | ||
|
|
1d5ca167c6 | ||
|
|
e4395a8cb7 | ||
|
|
5002ba5dd2 | ||
|
|
86f8c38a55 | ||
|
|
f2439bd22e | ||
|
|
78d0a0f2f6 | ||
|
|
a6973ec997 | ||
|
|
879768d121 | ||
|
|
3b98ed883b | ||
|
|
3497cde9b2 | ||
|
|
ff007aded7 | ||
|
|
7eab189f79 | ||
|
|
4a4094e253 | ||
|
|
2d7f2d37d9 | ||
|
|
9db2129e0c | ||
|
|
b0b3caf632 | ||
|
|
c93ea996c2 | ||
|
|
2f2d584159 | ||
|
|
aa18b753a3 | ||
|
|
daf1a0019c | ||
|
|
70a8dd8d2e | ||
|
|
6ea0b9fb34 | ||
|
|
0fb5b73aeb | ||
|
|
125a118938 | ||
|
|
39a71076c0 | ||
|
|
4ecd0e69a9 | ||
|
|
99589af9ad | ||
|
|
74cd0b5bb2 | ||
|
|
f5ede67568 | ||
|
|
ab726bedc9 | ||
|
|
864062b178 | ||
|
|
d58c32fb5c | ||
|
|
277cf599cf | ||
|
|
02ed1772ce | ||
|
|
a0b50b09d2 | ||
|
|
9c696f7920 | ||
|
|
ce5079969e | ||
|
|
c13766827c | ||
|
|
03c6884f0f | ||
|
|
ed390dd3dc | ||
|
|
d21e5ca6dd | ||
|
|
4b7fdf59fe | ||
|
|
d3417773b8 |
@@ -1 +0,0 @@
|
||||
gitea.fithwum.tech/fithwum/debian-base@sha256:4023732c1234033dd440901f801b44288d6acd1c2d9db5918b104028dbfbc31a
|
||||
@@ -12,7 +12,7 @@ on:
|
||||
- '!latest/CHANGES.md'
|
||||
- '!latest/build-info.json'
|
||||
schedule:
|
||||
- cron: '5 22 * * 0'
|
||||
- cron: '10 22 * * 0'
|
||||
|
||||
env:
|
||||
IMAGE_REGISTRY: gitea.fithwum.tech
|
||||
@@ -38,110 +38,9 @@ jobs:
|
||||
echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
|
||||
docker image prune -a -f || true
|
||||
|
||||
poll-debian-base-and-detect-changes:
|
||||
runs-on: vm-docker-build2
|
||||
needs: docker-prune
|
||||
outputs:
|
||||
digest_changed: ${{ steps.compare_digest.outputs.changed }}
|
||||
versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
|
||||
new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Ensure .cache exists
|
||||
run: mkdir -p .cache && touch .cache/.gitkeep
|
||||
|
||||
- name: Log in to Gitea Registry
|
||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
||||
|
||||
- name: Get current digest of debian-base image
|
||||
id: get_digest
|
||||
run: |
|
||||
IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
|
||||
docker pull "$IMAGE" > /dev/null
|
||||
DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
|
||||
echo "digest=$DIGEST" >> $GITHUB_OUTPUT
|
||||
echo "$DIGEST" > .cache/debian-base.digest.new
|
||||
|
||||
- name: Compare with stored digest
|
||||
id: compare_digest
|
||||
run: |
|
||||
CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
|
||||
LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
|
||||
|
||||
if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
|
||||
echo "[INFO] Digest unchanged"
|
||||
echo "changed=false" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "[INFO] Digest changed → updating cache"
|
||||
echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
|
||||
|
||||
git config user.name "${{ secrets.GIT_USERNAME }}"
|
||||
git config user.email "${{ secrets.GIT_EMAIL }}"
|
||||
|
||||
git add ${{ env.DIGEST_FILE }}
|
||||
git commit -m "Update base digest to $CURRENT_DIGEST" || true
|
||||
|
||||
# --- Safe rebase with auto conflict resolution ---
|
||||
git fetch origin main
|
||||
if ! git rebase --strategy-option=theirs origin/main; then
|
||||
echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
|
||||
git rebase --abort
|
||||
git fetch origin main
|
||||
git reset --hard origin/main
|
||||
echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
|
||||
git add ${{ env.DIGEST_FILE }}
|
||||
git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
|
||||
fi
|
||||
|
||||
git push origin HEAD:main
|
||||
echo "changed=true" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Detect changed vintage-story versions
|
||||
id: check_changed_versions
|
||||
run: |
|
||||
BEFORE_COMMIT="${{ github.event.before }}"
|
||||
if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
|
||||
BEFORE_COMMIT=$(git rev-parse HEAD~1)
|
||||
fi
|
||||
CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
|
||||
CHANGED_VERSIONS=""
|
||||
for version in $VERSIONS; do
|
||||
echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
|
||||
done
|
||||
CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
|
||||
echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Detect vintage-story versions without build-info
|
||||
id: check_new_versions
|
||||
run: |
|
||||
NEW_VERSIONS=""
|
||||
GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
|
||||
git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/vintage-story.git" upload-repo
|
||||
|
||||
for version in $VERSIONS; do
|
||||
if [ ! -f "upload-repo/$version/build-info.json" ]; then
|
||||
echo "[INFO] No build-info.json for $version → treating as new"
|
||||
NEW_VERSIONS="$NEW_VERSIONS $version"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
|
||||
|
||||
build-vintage-story-images:
|
||||
runs-on: vm-docker-build2
|
||||
needs:
|
||||
- docker-prune
|
||||
- poll-debian-base-and-detect-changes
|
||||
if: |
|
||||
needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
|
||||
needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
|
||||
needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
|
||||
needs: docker-prune
|
||||
strategy:
|
||||
matrix:
|
||||
version: [latest]
|
||||
|
||||
@@ -38,110 +38,9 @@ jobs:
|
||||
echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
|
||||
docker image prune -a -f || true
|
||||
|
||||
poll-debian-base-and-detect-changes:
|
||||
runs-on: vm-docker-build2
|
||||
needs: docker-prune
|
||||
outputs:
|
||||
digest_changed: ${{ steps.compare_digest.outputs.changed }}
|
||||
versions_changed: ${{ steps.check_changed_versions.outputs.versions_changed }}
|
||||
new_versions: ${{ steps.check_new_versions.outputs.new_versions }}
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Ensure .cache exists
|
||||
run: mkdir -p .cache && touch .cache/.gitkeep
|
||||
|
||||
- name: Log in to Gitea Registry
|
||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
||||
|
||||
- name: Get current digest of debian-base image
|
||||
id: get_digest
|
||||
run: |
|
||||
IMAGE="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_ORG }}/${{ env.IMAGE_REPO_DEBIAN }}:${{ env.IMAGE_TAG_DEBIAN }}"
|
||||
docker pull "$IMAGE" > /dev/null
|
||||
DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
|
||||
echo "digest=$DIGEST" >> $GITHUB_OUTPUT
|
||||
echo "$DIGEST" > .cache/debian-base.digest.new
|
||||
|
||||
- name: Compare with stored digest
|
||||
id: compare_digest
|
||||
run: |
|
||||
CURRENT_DIGEST="${{ steps.get_digest.outputs.digest }}"
|
||||
LAST_DIGEST="$(cat ${{ env.DIGEST_FILE }} 2>/dev/null || echo '')"
|
||||
|
||||
if [ "$CURRENT_DIGEST" = "$LAST_DIGEST" ]; then
|
||||
echo "[INFO] Digest unchanged"
|
||||
echo "changed=false" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "[INFO] Digest changed → updating cache"
|
||||
echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
|
||||
|
||||
git config user.name "${{ secrets.GIT_USERNAME }}"
|
||||
git config user.email "${{ secrets.GIT_EMAIL }}"
|
||||
|
||||
git add ${{ env.DIGEST_FILE }}
|
||||
git commit -m "Update base digest to $CURRENT_DIGEST" || true
|
||||
|
||||
# --- Safe rebase with auto conflict resolution ---
|
||||
git fetch origin main
|
||||
if ! git rebase --strategy-option=theirs origin/main; then
|
||||
echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
|
||||
git rebase --abort
|
||||
git fetch origin main
|
||||
git reset --hard origin/main
|
||||
echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
|
||||
git add ${{ env.DIGEST_FILE }}
|
||||
git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
|
||||
fi
|
||||
|
||||
git push origin HEAD:main
|
||||
echo "changed=true" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Detect changed vintage-story versions
|
||||
id: check_changed_versions
|
||||
run: |
|
||||
BEFORE_COMMIT="${{ github.event.before }}"
|
||||
if [ -z "$BEFORE_COMMIT" ] || ! git cat-file -e "$BEFORE_COMMIT^{commit}" 2>/dev/null; then
|
||||
BEFORE_COMMIT=$(git rev-parse HEAD~1)
|
||||
fi
|
||||
CHANGED=$(git diff --name-only "$BEFORE_COMMIT" HEAD || true)
|
||||
CHANGED_VERSIONS=""
|
||||
for version in $VERSIONS; do
|
||||
echo "$CHANGED" | grep -q "^$version/.*\.\(sh\|Dockerfile\)$" && CHANGED_VERSIONS="$CHANGED_VERSIONS $version"
|
||||
done
|
||||
CHANGED_VERSIONS=$(echo "$CHANGED_VERSIONS" | xargs) # trim whitespace
|
||||
echo "versions_changed=$CHANGED_VERSIONS" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Detect vintage-story versions without build-info
|
||||
id: check_new_versions
|
||||
run: |
|
||||
NEW_VERSIONS=""
|
||||
GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
|
||||
git clone --depth=1 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/vintage-story.git" upload-repo
|
||||
|
||||
for version in $VERSIONS; do
|
||||
if [ ! -f "upload-repo/$version/build-info.json" ]; then
|
||||
echo "[INFO] No build-info.json for $version → treating as new"
|
||||
NEW_VERSIONS="$NEW_VERSIONS $version"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "new_versions=$NEW_VERSIONS" >> $GITHUB_OUTPUT
|
||||
|
||||
build-vintage-story-images:
|
||||
runs-on: vm-docker-build2
|
||||
needs:
|
||||
- docker-prune
|
||||
- poll-debian-base-and-detect-changes
|
||||
if: |
|
||||
needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' ||
|
||||
needs.poll-debian-base-and-detect-changes.outputs.versions_changed != '' ||
|
||||
needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
|
||||
needs: docker-prune
|
||||
strategy:
|
||||
matrix:
|
||||
version: [testing]
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
# Vintage Story
|
||||
|
||||
[](https://gitea.fithwum.tech/fithwum/vintage-story/actions?workflow=vintage-story-build-server.yml)
|
||||
|
||||
|
||||
## Getting started
|
||||
|
||||
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
|
||||
|
||||
+5
-3
@@ -1,5 +1,7 @@
|
||||
## 2026-07-28T18:54:59Z
|
||||
## 2026-08-16T22:11:51Z
|
||||
|
||||
- update and add testing build (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-07-28T18:48:03Z [skip ci] (fithwum)
|
||||
- Update build-info on 2026-08-16T22:06:56Z [skip ci] (fithwum)
|
||||
- Merge changelog updates (fithwum)
|
||||
- Update changelogs on 2026-08-16T22:06:45Z [skip ci] (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "latest",
|
||||
"commit": "bf7e754e81b14116c8c64da4cea285dbb87123bc",
|
||||
"build_time": "2026-07-28T18:55:12Z",
|
||||
"commit": "97d139b01a7d9ee16d5b1ff1f4ce75a70c1ce686",
|
||||
"build_time": "2026-08-16T22:12:12Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/vintage-story:latest",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:c32c9aa58784c27e1653421d333b596f3f87f53729b17849cd033cb1e275730e",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:e90a6ed95f1cc2162bdcda31a507d9ec7b9a4d82f15f47a5ea4999b084426254",
|
||||
"image_size": "410MB",
|
||||
"image_size_bytes": 430943709
|
||||
"image_size_bytes": 430959495
|
||||
}
|
||||
|
||||
+62
-25
@@ -6,8 +6,8 @@ VS_SERVER_DIR=/vs_server/server
|
||||
VS_DATA_DIR=/vs_server/server/data
|
||||
LOG_FILE=$VS_DATA_DIR/Logs/server-main.log
|
||||
MARKER_FILE=$VS_SERVER_DIR/.setup_done
|
||||
START_FILE_1=$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
|
||||
INSTALLED_VERSION=$VS_SERVER_DIR/installed-$TARGET_VERSION
|
||||
START_FILE=$VS_SERVER_DIR/server.sh
|
||||
MS_REPO_URL=https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb
|
||||
USERNAME=adduser vintagestory
|
||||
|
||||
@@ -59,33 +59,70 @@ else
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
# Main install (Debian).
|
||||
# Main install & auto update.
|
||||
# Check for server files and download if needed.
|
||||
if [ -e $START_FILE_1 ]
|
||||
then
|
||||
# Fallback to stable channel if VS_CHANNEL is blank
|
||||
: "${VS_CHANNEL:=stable}"
|
||||
echo "Using channel: $VS_CHANNEL"
|
||||
|
||||
# Get the currently installed version from filesystem
|
||||
CUR_V=$(find "$VS_SERVER_DIR" -name "installed-*" | cut -d - -f2-)
|
||||
echo "Current local version: '${CUR_V:-None}'"
|
||||
|
||||
# Fetch the API JSON cleanly
|
||||
API_URL="http://api.vintagestory.at/${VS_CHANNEL}.json"
|
||||
JSON=$(wget -qO- "$API_URL")
|
||||
|
||||
# Validate that we actually received valid JSON
|
||||
if [ -z "$JSON" ] || ! echo "$JSON" | jq . >/dev/null 2>&1; then
|
||||
echo "Error: Failed to fetch valid JSON from $API_URL"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Resolve the target version dynamically from the JSON Object keys
|
||||
if [ ! -z "$VS_VERSION" ] && [ "$VS_VERSION" != "latest" ]; then
|
||||
# User specified an exact version. Check if it exists as a key in the object
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r --arg version "$VS_VERSION" 'if .[$version] then $version else "" end')
|
||||
if [ -z "$TARGET_VERSION" ]; then
|
||||
echo "Error: Specified version '$VS_VERSION' not found in the $VS_CHANNEL channel API."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
# No version specified or "latest" chosen. Get the very first key from the object
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r 'keys_unsorted | .[0]')
|
||||
fi
|
||||
echo "Target version determined: '$TARGET_VERSION'"
|
||||
|
||||
# Compare versions and only download if they do NOT match
|
||||
if [ "$CUR_V" != "$TARGET_VERSION" ]; then
|
||||
echo "Versions differ ($CUR_V vs $TARGET_VERSION). Fetching CDN download URL..."
|
||||
# Extract the CDN download link using the valid object key structure
|
||||
VS_SERVER_FILE=$(echo "$JSON" | jq -r --arg version "$TARGET_VERSION" '.[$version].linuxserver.urls.cdn')
|
||||
if [ "$VS_SERVER_FILE" == "null" ] || [ -z "$VS_SERVER_FILE" ]; then
|
||||
echo "Error: Download URL not found for version $TARGET_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
echo "Ready to download: $VS_SERVER_FILE"
|
||||
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_1
|
||||
chmod +x $START_FILE_1
|
||||
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_$TARGET_VERSION.tar.gz
|
||||
tar -xzf /vstemp/vs_server_linux-x64_$TARGET_VERSION.tar.gz -C /vstemp/files
|
||||
rm -fr /vstemp/*.tar.gz
|
||||
mv -uf /vstemp/files/* $VS_SERVER_DIR/
|
||||
chmod +x $START_FILE
|
||||
touch $INSTALLED_VERSION
|
||||
else
|
||||
echo "No update required. Local version matches target version."
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting server path."
|
||||
sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE_1
|
||||
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_1
|
||||
sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE
|
||||
|
||||
# Set permissions.
|
||||
chown 99:100 -R $VS_SERVER_DIR
|
||||
@@ -94,7 +131,7 @@ 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
|
||||
yes y | $VS_SERVER_DIR/server.sh setup $USERNAME $VS_DATA_DIR
|
||||
touch $MARKER_FILE
|
||||
echo "Setup successfully completed."
|
||||
fi
|
||||
@@ -102,7 +139,7 @@ fi
|
||||
# Run vintage-story server.
|
||||
echo " "
|
||||
echo "INFO ! Starting vintage-story Server $VS_VERSION"
|
||||
.$START_FILE_1 start
|
||||
.$START_FILE start
|
||||
|
||||
echo "Waiting for the server log file to be created..."
|
||||
# Loop indefinitely until the log file actually exists on disk
|
||||
|
||||
+4
-3
@@ -1,6 +1,7 @@
|
||||
## 2026-07-28T18:55:01Z
|
||||
## 2026-08-16T22:06:45Z
|
||||
|
||||
- update and add testing build (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-07-28T18:48:03Z [skip ci] (fithwum)
|
||||
- Update build-info on 2026-08-09T22:12:04Z [skip ci] (fithwum)
|
||||
- Merge changelog updates (fithwum)
|
||||
- Update changelogs on 2026-08-09T22:11:52Z [skip ci] (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "testing",
|
||||
"commit": "2d81ab8f90fd49ded59f6f72482c85ef197fb830",
|
||||
"build_time": "2026-07-28T18:55:15Z",
|
||||
"commit": "189cd8106b17821d0e2ccd240af3c85e54d9c645",
|
||||
"build_time": "2026-08-16T22:06:56Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/vintage-story:testing",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:db1127041469a4a98fe560d7fbb62be7765de1d8c8b98bc5cc1534fd92d78e93",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:cdf8ab5f469ff4d05d8431d65a7bad59229b7686e7c69b8eb5d623fcf0c9b2e4",
|
||||
"image_size": "410MB",
|
||||
"image_size_bytes": 430944198
|
||||
"image_size_bytes": 430946035
|
||||
}
|
||||
|
||||
+59
-22
@@ -6,9 +6,9 @@ VS_SERVER_DIR=/vs_server/server
|
||||
VS_DATA_DIR=/vs_server/server/data
|
||||
LOG_FILE=$VS_DATA_DIR/Logs/server-main.log
|
||||
MARKER_FILE=$VS_SERVER_DIR/.setup_done
|
||||
START_FILE_1=$VS_SERVER_DIR/server-$VS_VERSION.sh
|
||||
INSTALLED_VERSION=$VS_SERVER_DIR/installed-$TARGET_VERSION
|
||||
START_FILE_1=$VS_SERVER_DIR/server.sh
|
||||
START_FILE_2=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/testing/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
|
||||
|
||||
@@ -60,27 +60,64 @@ else
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
# Main install (Debian).
|
||||
# Main install & auto update.
|
||||
# Check for server files and download if needed.
|
||||
if [ -e $START_FILE_1 ]
|
||||
then
|
||||
# Fallback to stable channel if VS_CHANNEL is blank
|
||||
: "${VS_CHANNEL:=stable}"
|
||||
echo "Using channel: $VS_CHANNEL"
|
||||
|
||||
# Get the currently installed version from filesystem
|
||||
CUR_V=$(find "$VS_SERVER_DIR" -name "installed-*" | cut -d - -f2-)
|
||||
echo "Current local version: '${CUR_V:-None}'"
|
||||
|
||||
# Fetch the API JSON cleanly
|
||||
API_URL="http://api.vintagestory.at/$VS_CHANNEL.json"
|
||||
JSON=$(wget -qO- "$API_URL")
|
||||
|
||||
# Validate that we actually received valid JSON
|
||||
if [ -z "$JSON" ] || ! echo "$JSON" | jq . >/dev/null 2>&1; then
|
||||
echo "Error: Failed to fetch valid JSON from $API_URL"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Resolve the target version dynamically from the JSON Object keys
|
||||
if [ ! -z "$VS_VERSION" ] && [ "$VS_VERSION" != "latest" ]; then
|
||||
# User specified an exact version. Check if it exists as a key in the object
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r --arg version "$VS_VERSION" 'if .[$version] then $version else "" end')
|
||||
if [ -z "$TARGET_VERSION" ]; then
|
||||
echo "Error: Specified version '$VS_VERSION' not found in the $VS_CHANNEL channel API."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
# No version specified or "latest" chosen. Get the very first key from the object
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r 'keys_unsorted | .[0]')
|
||||
fi
|
||||
echo "Target version determined: '$TARGET_VERSION'"
|
||||
|
||||
# Compare versions and only download if they do NOT match
|
||||
if [ "$CUR_V" != "$TARGET_VERSION" ]; then
|
||||
echo "Versions differ ($CUR_V vs $TARGET_VERSION). Fetching CDN download URL..."
|
||||
# Extract the CDN download link using the valid object key structure
|
||||
VS_SERVER_FILE=$(echo "$JSON" | jq -r --arg version "$TARGET_VERSION" '.[$version].linuxserver.urls.cdn')
|
||||
if [ "$VS_SERVER_FILE" == "null" ] || [ -z "$VS_SERVER_FILE" ]; then
|
||||
echo "Error: Download URL not found for version $TARGET_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
echo "Ready to download: $VS_SERVER_FILE"
|
||||
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_1
|
||||
chmod +x $START_FILE_1
|
||||
echo "INFO ! Cleaning old files."
|
||||
mkdir -pv $VS_SERVER_DIR/old-server-versions/
|
||||
mv $VS_SERVER_DIR/*.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 $VS_SERVER_DIR/installed-*
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $VS_SERVER_FILE -O /vstemp/vs_server_linux-x64_$TARGET_VERSION.tar.gz
|
||||
tar -xzf /vstemp/vs_server_linux-x64_$TARGET_VERSION.tar.gz -C /vstemp/files
|
||||
rm -fr /vstemp/*.tar.gz
|
||||
mv -uf /vstemp/files/* $VS_SERVER_DIR/
|
||||
chmod +x $START_FILE_1
|
||||
touch $INSTALLED_VERSION
|
||||
else
|
||||
echo "No update required. Local version matches target version."
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting server path."
|
||||
@@ -95,7 +132,7 @@ 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
|
||||
yes y | $VS_SERVER_DIR/server.sh setup $USERNAME $VS_DATA_DIR
|
||||
touch $MARKER_FILE
|
||||
echo "Setup successfully completed."
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user