Compare commits
36
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
384bb8eaca | ||
|
|
4b7fdf59fe | ||
|
|
d3417773b8 | ||
|
|
791e9b7c48 | ||
|
|
b37f6936d1 | ||
|
|
2d81ab8f90 | ||
|
|
e44b12f26e | ||
|
|
bf7e754e81 | ||
|
|
c3110979a1 | ||
|
|
1145e40d08 | ||
|
|
9eb203bd47 | ||
|
|
e8dc20eacc | ||
|
|
68d63fec74 | ||
|
|
88137ab0d5 | ||
|
|
ed63deec0b | ||
|
|
14c37d1e66 | ||
|
|
a09fe6326b | ||
|
|
211d66b353 | ||
|
|
2d46ec0f7c | ||
|
|
83441fe6ce | ||
|
|
9790e7dbd9 | ||
|
|
d7c7d743fe | ||
|
|
847d73e539 | ||
|
|
905fce1f66 | ||
|
|
3d8511dc08 | ||
|
|
c8c1c3a2ca | ||
|
|
ef0edf8895 | ||
|
|
407a1a1315 | ||
|
|
01c9827f1b | ||
|
|
6f9ba1c115 | ||
|
|
7b02303bf2 | ||
|
|
c4639298ae | ||
|
|
21788f57ec | ||
|
|
ad396a5204 | ||
|
|
ba0b3d3eeb | ||
|
|
6daadba60a |
@@ -1 +0,0 @@
|
||||
gitea.fithwum.tech/fithwum/debian-base@sha256:4023732c1234033dd440901f801b44288d6acd1c2d9db5918b104028dbfbc31a
|
||||
@@ -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]
|
||||
|
||||
@@ -0,0 +1,309 @@
|
||||
name: vintage-story-build-testing
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- '.gitea/workflows/vintage-story-build-testing.yml'
|
||||
- 'testing/Dockerfile'
|
||||
- 'testing/*.sh'
|
||||
- '!.cache/*'
|
||||
- '!testing/CHANGES.md'
|
||||
- '!testing/build-info.json'
|
||||
schedule:
|
||||
- cron: '5 22 * * 0'
|
||||
|
||||
env:
|
||||
IMAGE_REGISTRY: gitea.fithwum.tech
|
||||
IMAGE_ORG: fithwum
|
||||
IMAGE_REPO_DEBIAN: debian-base
|
||||
IMAGE_REPO_VINTAGE_STORY: vintage-story
|
||||
IMAGE_TAG_DEBIAN: bookworm
|
||||
DIGEST_FILE: .cache/debian-base.digest
|
||||
VERSIONS: testing
|
||||
|
||||
jobs:
|
||||
docker-prune:
|
||||
name: Docker prune (${{ matrix.runner }})
|
||||
runs-on: ${{ matrix.runner }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
runner:
|
||||
- vm-docker-build2
|
||||
steps:
|
||||
- name: Prune unused Docker images
|
||||
run: |
|
||||
echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
|
||||
docker image prune -a -f || true
|
||||
|
||||
build-vintage-story-images:
|
||||
runs-on: vm-docker-build2
|
||||
needs: docker-prune
|
||||
strategy:
|
||||
matrix:
|
||||
version: [testing]
|
||||
name: Build and Push ${{ matrix.version }}
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Log in to Gitea Registry
|
||||
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login gitea.fithwum.tech -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
|
||||
|
||||
- name: Clone vintage-story repo (with retries)
|
||||
run: |
|
||||
GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
|
||||
for i in {1..5}; do
|
||||
git clone "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/vintage-story.git" upload-repo && break
|
||||
echo "[WARN] Clone attempt $i failed. Retrying in 10s..."
|
||||
sleep 10
|
||||
done
|
||||
if [ ! -d upload-repo ]; then
|
||||
echo "[ERROR] Failed to clone vintage-story repo after retries."
|
||||
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 --pull --no-cache --push -t "$IMAGE" "./${{ matrix.version }}"
|
||||
|
||||
generate-changelogs:
|
||||
needs: build-vintage-story-images
|
||||
runs-on: vm-docker-build2
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Create temporary changelog workspace
|
||||
run: mkdir -p changelogs
|
||||
|
||||
- name: Clone vintage-story repo
|
||||
run: |
|
||||
GIT_CREDENTIAL="${{ secrets.GIT_TOKEN || secrets.GIT_PASSWORD }}"
|
||||
git clone --depth=3 "https://${{ secrets.GIT_USERNAME }}:${GIT_CREDENTIAL}@gitea.fithwum.tech/fithwum/vintage-story.git" upload-repo
|
||||
|
||||
- name: Generate changelogs
|
||||
run: |
|
||||
for version in $VERSIONS; do
|
||||
echo "[INFO] Generating changelog for $version"
|
||||
changelog="changelogs/$version/CHANGES.md"
|
||||
mkdir -p "$(dirname "$changelog")"
|
||||
touch "$changelog"
|
||||
|
||||
cd upload-repo
|
||||
infofile="$version/build-info.json"
|
||||
last_commit=""
|
||||
if [ -f "$infofile" ]; then
|
||||
last_commit=$(jq -r '.commit' "$infofile")
|
||||
fi
|
||||
|
||||
echo -e "## $(date -u +'%Y-%m-%dT%H:%M:%SZ')\n" > "../$changelog"
|
||||
if [ -n "$last_commit" ]; then
|
||||
COMMITS=$(git log "${last_commit}..HEAD" --pretty=format:"- %s (%an)" || true)
|
||||
fi
|
||||
if [ -z "$COMMITS" ]; then
|
||||
echo "[INFO] No new commits since last build. Showing latest 5 instead."
|
||||
COMMITS=$(git log -n 5 --pretty=format:"- %s (%an)" || true)
|
||||
fi
|
||||
echo "$COMMITS" >> "../$changelog"
|
||||
cd ..
|
||||
done
|
||||
|
||||
- name: Copy changelogs into repo
|
||||
run: |
|
||||
for version in $VERSIONS; do
|
||||
mkdir -p upload-repo/$version
|
||||
cp changelogs/$version/CHANGES.md upload-repo/$version/
|
||||
done
|
||||
|
||||
- name: Commit and push changelogs (temp branch)
|
||||
run: |
|
||||
cd upload-repo
|
||||
|
||||
git config user.name "${{ secrets.GIT_USERNAME }}"
|
||||
git config user.email "${{ secrets.GIT_EMAIL }}"
|
||||
|
||||
TEMP_BRANCH="tmp-changelog-$(date +%s)"
|
||||
|
||||
# Create temporary branch
|
||||
git checkout -b "$TEMP_BRANCH"
|
||||
|
||||
# Stage changes
|
||||
git add */CHANGES.md
|
||||
|
||||
# Nothing changed?
|
||||
if git diff --cached --quiet; then
|
||||
echo "[INFO] No changelog changes."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
|
||||
|
||||
# Push temporary branch
|
||||
git push origin HEAD:$TEMP_BRANCH
|
||||
|
||||
# Rebase temp branch onto latest main
|
||||
git fetch origin main
|
||||
|
||||
git checkout "$TEMP_BRANCH"
|
||||
|
||||
if ! git rebase origin/main; then
|
||||
echo "[WARN] Rebase failed, using merge instead."
|
||||
git rebase --abort || true
|
||||
git merge origin/main --no-edit
|
||||
fi
|
||||
|
||||
git push origin HEAD:$TEMP_BRANCH --force
|
||||
|
||||
# Fast-forward main
|
||||
git checkout main
|
||||
git reset --hard origin/main
|
||||
|
||||
git merge --no-ff "$TEMP_BRANCH" \
|
||||
-m "Merge changelog updates"
|
||||
|
||||
git push origin main
|
||||
|
||||
git push origin --delete "$TEMP_BRANCH" || true
|
||||
|
||||
generate-build-info:
|
||||
needs: generate-changelogs
|
||||
runs-on: vm-docker-build2
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Prepare temporary build-info workspace
|
||||
run: mkdir -p buildinfo
|
||||
|
||||
- name: Clone vintage-story repo
|
||||
run: |
|
||||
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
|
||||
|
||||
- name: Generate build-info files
|
||||
run: |
|
||||
human_size() {
|
||||
local b=$1 d='' s=0 S=(B KB MB GB TB)
|
||||
while ((b >= 1024 && s < ${#S[@]}-1)); do
|
||||
d=$((b % 1024)); b=$((b / 1024)); s=$((s + 1))
|
||||
done
|
||||
printf "%s%s\n" "$b" "${S[$s]}"
|
||||
}
|
||||
|
||||
for version in $VERSIONS; do
|
||||
echo "[INFO] Generating build-info.json for $version"
|
||||
image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_VINTAGE_STORY}:$version"
|
||||
infofile="buildinfo/$version/build-info.json"
|
||||
mkdir -p "$(dirname "$infofile")"
|
||||
|
||||
if ! docker pull "$image"; then
|
||||
echo "[WARN] Failed to pull $image — setting fields to unknown/0"
|
||||
digest="unknown"
|
||||
size_bytes=0
|
||||
else
|
||||
digest=$(docker inspect --format='{{if .RepoDigests}}{{index .RepoDigests 0}}{{else}}unknown{{end}}' "$image" 2>/dev/null || echo "unknown")
|
||||
size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0")
|
||||
size_bytes=${size_bytes//[^0-9]/}
|
||||
if [[ -z "$size_bytes" ]]; then size_bytes=0; fi
|
||||
fi
|
||||
|
||||
size_human=$(human_size "$size_bytes")
|
||||
|
||||
cd upload-repo
|
||||
commit=$(git rev-parse HEAD)
|
||||
cd ..
|
||||
|
||||
jq -n \
|
||||
--arg version "$version" \
|
||||
--arg commit "$commit" \
|
||||
--arg build_time "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
|
||||
--arg image_tag "$image" \
|
||||
--arg digest "$digest" \
|
||||
--arg image_size "$size_human" \
|
||||
--argjson image_size_bytes "$size_bytes" \
|
||||
'{
|
||||
version: $version,
|
||||
commit: $commit,
|
||||
build_time: $build_time,
|
||||
image_tag: $image_tag,
|
||||
digest: $digest,
|
||||
image_size: $image_size,
|
||||
image_size_bytes: $image_size_bytes
|
||||
}' > "$infofile"
|
||||
done
|
||||
|
||||
- name: Copy build-info.json into repo
|
||||
run: |
|
||||
for version in $VERSIONS; do
|
||||
mkdir -p upload-repo/$version
|
||||
cp "buildinfo/$version/build-info.json" "upload-repo/$version/"
|
||||
done
|
||||
|
||||
- name: Commit and push build-info (temp branch)
|
||||
run: |
|
||||
cd upload-repo
|
||||
|
||||
git config user.name "${{ secrets.GIT_USERNAME }}"
|
||||
git config user.email "${{ secrets.GIT_EMAIL }}"
|
||||
|
||||
TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
|
||||
|
||||
# Create temporary branch
|
||||
git checkout -b "$TEMP_BRANCH"
|
||||
|
||||
# Stage changes
|
||||
git add */build-info.json
|
||||
|
||||
# Nothing changed?
|
||||
if git diff --cached --quiet; then
|
||||
echo "[INFO] No build-info changes."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
|
||||
|
||||
# Push temporary branch
|
||||
git push origin HEAD:$TEMP_BRANCH
|
||||
|
||||
# Rebase temp branch onto latest main
|
||||
git fetch origin main
|
||||
|
||||
git checkout "$TEMP_BRANCH"
|
||||
|
||||
if ! git rebase origin/main; then
|
||||
echo "[WARN] Rebase failed, using merge instead."
|
||||
git rebase --abort || true
|
||||
git merge origin/main --no-edit
|
||||
fi
|
||||
|
||||
git push origin HEAD:$TEMP_BRANCH --force
|
||||
|
||||
# Merge into main
|
||||
git checkout main
|
||||
git reset --hard origin/main
|
||||
|
||||
git merge --no-ff "$TEMP_BRANCH" \
|
||||
-m "Merge build-info updates"
|
||||
|
||||
git push origin main
|
||||
|
||||
git push origin --delete "$TEMP_BRANCH" || true
|
||||
|
||||
for version in $VERSIONS; do
|
||||
TAG="build-$version"
|
||||
|
||||
git tag -d "$TAG" 2>/dev/null || true
|
||||
git push origin ":refs/tags/$TAG" 2>/dev/null || true
|
||||
|
||||
git tag "$TAG"
|
||||
git push origin "$TAG" --force
|
||||
done
|
||||
@@ -3,4 +3,5 @@
|
||||
# All rights reserved
|
||||
|
||||
docker build --pull --rm -f "latest/Dockerfile" -t gitea.fithwum.tech/fithwum/vintage-story:latest "latest"
|
||||
docker build --pull --rm -f "testing/Dockerfile" -t gitea.fithwum.tech/fithwum/vintage-story:testing "testing"
|
||||
docker push -a gitea.fithwum.tech/fithwum/vintage-story
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
## 2026-07-28T17:56:43Z
|
||||
## 2026-07-28T18:54:59Z
|
||||
|
||||
- update (fithwum)
|
||||
- update and add testing build (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-07-28T17:53:30Z [skip ci] (fithwum)
|
||||
- Update build-info on 2026-07-28T18:48:03Z [skip ci] (fithwum)
|
||||
|
||||
@@ -4,7 +4,6 @@ LABEL maintainer="fithwum"
|
||||
# Environment Variables
|
||||
ENV VS_CHANNEL=""
|
||||
ENV VS_VERSION=""
|
||||
ENV USERNAME=""
|
||||
ENV DOTNET_VERSION=""
|
||||
|
||||
# URL's for files
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "latest",
|
||||
"commit": "969cff7202be3e06def81b544f13329dc7fbd115",
|
||||
"build_time": "2026-07-28T17:56:55Z",
|
||||
"commit": "bf7e754e81b14116c8c64da4cea285dbb87123bc",
|
||||
"build_time": "2026-07-28T18:55:12Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/vintage-story:latest",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:b7143eeca154aa969de7a1ec6130b981234b362587e40a9d8c95c2f88aef0c94",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:c32c9aa58784c27e1653421d333b596f3f87f53729b17849cd033cb1e275730e",
|
||||
"image_size": "410MB",
|
||||
"image_size_bytes": 430943722
|
||||
"image_size_bytes": 430943709
|
||||
}
|
||||
|
||||
+18
-31
@@ -2,12 +2,11 @@
|
||||
# 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=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/latest/start.sh
|
||||
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
|
||||
MS_REPO_URL=https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb
|
||||
USERNAME=adduser vintagestory
|
||||
@@ -62,7 +61,7 @@ fi
|
||||
|
||||
# Main install (Debian).
|
||||
# Check for server files and download if needed.
|
||||
if [ -e $START_FILE ]
|
||||
if [ -e $START_FILE_1 ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! server-$VS_VERSION.sh found starting now."
|
||||
@@ -79,14 +78,14 @@ if [ -e $START_FILE ]
|
||||
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
|
||||
mv $VS_SERVER_DIR/server.sh $START_FILE_1
|
||||
chmod +x $START_FILE_1
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting server path."
|
||||
sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE
|
||||
sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE_1
|
||||
echo "INFO ! Setting data path."
|
||||
sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE
|
||||
sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE_1
|
||||
|
||||
# Set permissions.
|
||||
chown 99:100 -R $VS_SERVER_DIR
|
||||
@@ -100,31 +99,19 @@ if [ ! -f $MARKER_FILE ]; then
|
||||
echo "Setup successfully completed."
|
||||
fi
|
||||
|
||||
# Download the start file for the screen session
|
||||
if [ -f $VS_SERVER_DIR/start.sh ]; 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 -O $VS_SERVER_DIR/start.sh
|
||||
chmod +x $VS_SERVER_DIR/start.sh
|
||||
fi
|
||||
|
||||
# Run vintage-story server.
|
||||
cd $VS_SERVER_DIR
|
||||
exec ./start.sh
|
||||
echo " "
|
||||
echo "INFO ! Starting vintage-story Server $VS_VERSION"
|
||||
.$START_FILE_1 start
|
||||
|
||||
# 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 "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"
|
||||
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
|
||||
@@ -0,0 +1,5 @@
|
||||
## 2026-07-29T01:57:03Z
|
||||
|
||||
- updates (fithwum)
|
||||
- updates (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
@@ -0,0 +1,32 @@
|
||||
FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
|
||||
LABEL maintainer="fithwum"
|
||||
|
||||
# Environment Variables
|
||||
ENV VS_CHANNEL=""
|
||||
ENV VS_VERSION=""
|
||||
ENV DOTNET_VERSION=""
|
||||
|
||||
# URL's for files
|
||||
ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/testing/install_script.sh
|
||||
|
||||
# Install Dependencies.
|
||||
RUN apt-get -y update && apt-get autoclean && apt-get autoremove \
|
||||
&& apt-get -y update && apt-get install -y bzip2 jq wget procps pcregrep screen \
|
||||
&& adduser vintagestory \
|
||||
&& apt-get -y --fix-broken install \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& update-ca-certificates -f;
|
||||
|
||||
# Folder creation.
|
||||
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
|
||||
|
||||
RUN wget --no-cache "$INSTALL_SCRIPT" -O /vstemp/install_script.sh \
|
||||
&& chmod +x /vstemp/install_script.sh
|
||||
|
||||
# Directory where data is stored
|
||||
VOLUME /vs_server
|
||||
|
||||
# Run command
|
||||
CMD [ "/bin/bash", "./vstemp/install_script.sh" ]
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"version": "testing",
|
||||
"commit": "2d81ab8f90fd49ded59f6f72482c85ef197fb830",
|
||||
"build_time": "2026-07-28T18:55:15Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/vintage-story:testing",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:db1127041469a4a98fe560d7fbb62be7765de1d8c8b98bc5cc1534fd92d78e93",
|
||||
"image_size": "410MB",
|
||||
"image_size_bytes": 430944198
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
# 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_1 ]
|
||||
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_1
|
||||
chmod +x $START_FILE_1
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting server path."
|
||||
sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE_1
|
||||
echo "INFO ! Setting data path."
|
||||
sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE_1
|
||||
|
||||
# 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"
|
||||
# .$START_FILE_1 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
|
||||
@@ -5,8 +5,6 @@
|
||||
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 ..."
|
||||
@@ -27,5 +25,5 @@ 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 ./VintagestoryServer.dll
|
||||
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"
|
||||
Reference in New Issue
Block a user