Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 fithwum
|
27442497d4 |
@@ -0,0 +1 @@
|
||||
gitea.fithwum.tech/fithwum/debian-base@sha256:b405854d9dbfb510af67cd8d949a488c86d05c3ac1890558c40a6bf993d82703
|
||||
@@ -0,0 +1,21 @@
|
||||
# - 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 "changed=false" >> $GITHUB_OUTPUT
|
||||
# else
|
||||
# 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
|
||||
# # Try to rebase onto latest remote
|
||||
# git pull --rebase || {
|
||||
# echo "[ERROR] Rebase failed — aborting."
|
||||
# exit 1
|
||||
# }
|
||||
# git push
|
||||
# echo "changed=true" >> $GITHUB_OUTPUT
|
||||
# fi
|
||||
@@ -38,9 +38,110 @@ jobs:
|
||||
echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
|
||||
docker image prune -a -f || true
|
||||
|
||||
build-minecraft-images:
|
||||
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 master
|
||||
if ! git rebase --strategy-option=theirs origin/master; then
|
||||
echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
|
||||
git rebase --abort
|
||||
git fetch origin master
|
||||
git reset --hard origin/master
|
||||
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:master
|
||||
echo "changed=true" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Detect changed Minecraft 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 Minecraft 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/minecraft.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-minecraft-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 != ''
|
||||
strategy:
|
||||
matrix:
|
||||
version: [minecraft]
|
||||
@@ -65,15 +166,10 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Clear BuildKit cache
|
||||
run: |
|
||||
docker builder prune -af || true
|
||||
docker buildx prune -af || true
|
||||
|
||||
- name: Build and push image
|
||||
run: |
|
||||
IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
|
||||
docker buildx build --platform linux/amd64 --pull --no-cache --push -t "$IMAGE" "./${{ matrix.version }}"
|
||||
docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
|
||||
|
||||
generate-changelogs:
|
||||
needs: build-minecraft-images
|
||||
|
||||
@@ -38,9 +38,110 @@ jobs:
|
||||
echo "[INFO] Pruning Docker images on ${{ matrix.runner }}..."
|
||||
docker image prune -a -f || true
|
||||
|
||||
build-minecraft-images:
|
||||
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 master
|
||||
if ! git rebase --strategy-option=theirs origin/master; then
|
||||
echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
|
||||
git rebase --abort
|
||||
git fetch origin master
|
||||
git reset --hard origin/master
|
||||
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:master
|
||||
echo "changed=true" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Detect changed Minecraft 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 Minecraft 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/minecraft.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-minecraft-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 != ''
|
||||
strategy:
|
||||
matrix:
|
||||
version: [testing]
|
||||
@@ -65,15 +166,10 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Clear BuildKit cache
|
||||
run: |
|
||||
docker builder prune -af || true
|
||||
docker buildx prune -af || true
|
||||
|
||||
- name: Build and push image
|
||||
run: |
|
||||
IMAGE="$IMAGE_REGISTRY/$IMAGE_ORG/$IMAGE_REPO_MINECRAFT:${{ matrix.version }}"
|
||||
docker buildx build --platform linux/amd64 --pull --no-cache --push -t "$IMAGE" "./${{ matrix.version }}"
|
||||
docker buildx build --platform linux/amd64 --push -t "$IMAGE" "./${{ matrix.version }}"
|
||||
|
||||
generate-changelogs:
|
||||
needs: build-minecraft-images
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
## 2026-08-09T21:36:46Z
|
||||
## 2026-07-20T17:29:37Z
|
||||
|
||||
- update (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-08-09T21:31:56Z [skip ci] (fithwum)
|
||||
- Update build-info on 2026-07-20T17:17:51Z [skip ci] (fithwum)
|
||||
- Merge changelog updates (fithwum)
|
||||
- Update changelogs on 2026-08-09T21:31:42Z [skip ci] (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
|
||||
@@ -2,9 +2,10 @@ FROM gitea.fithwum.tech/fithwum/debian-base:trixie
|
||||
LABEL maintainer="fithwum"
|
||||
|
||||
# Environment Variables.
|
||||
# Minecarft settings.
|
||||
ENV ACCEPT_EULA=""
|
||||
ENV GAME_PORT=""
|
||||
|
||||
# Minecarft versions.
|
||||
ENV MC_TYPE=""
|
||||
ENV MC_VERSION=""
|
||||
ENV QUILT_VERSION=""
|
||||
@@ -13,13 +14,9 @@ ENV NEOFORGED_VERSION=""
|
||||
ENV FABRIC_VERSION=""
|
||||
ENV FABRIC_INSTALLER_VERSION=""
|
||||
|
||||
# RCON settings.
|
||||
ENV ENABLE_RCON=""
|
||||
ENV RCON_PORT=""
|
||||
ENV RCON_PASSWORD=""
|
||||
|
||||
# Java settings.
|
||||
ENV JAVA_VERSION=""
|
||||
|
||||
ENV XMX_SIZE=""
|
||||
ENV XMS_SIZE=""
|
||||
ENV XMN_SIZE=""
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "minecraft",
|
||||
"commit": "df114a0900e7999360513bb3b540e7550ce5dfa9",
|
||||
"build_time": "2026-08-09T21:36:57Z",
|
||||
"commit": "6ca0c5c90210eb88caaf3f896d6c4f6b4bc0ec09",
|
||||
"build_time": "2026-07-20T17:29:50Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/minecraft:minecraft",
|
||||
"digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:41049ca42113c9ec177af14c5b74713385c10eb279cf283482f07e841ad32fec",
|
||||
"digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:fdbfd7f086b2eeaf5c093ed3076f2cacdc3032ea21d23cca2c8d0571d19fea27",
|
||||
"image_size": "302MB",
|
||||
"image_size_bytes": 317406827
|
||||
"image_size_bytes": 317404846
|
||||
}
|
||||
|
||||
+115
-107
@@ -1,19 +1,16 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
DEBIAN_VERSION=13
|
||||
MC_DIR=/mcserver
|
||||
EULA_FILE=$MC_DIR/eula.txt
|
||||
EULA_MARKER=$MC_DIR/.eula_accepted
|
||||
|
||||
MS_REPO=https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb
|
||||
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/minecraft/server.properties
|
||||
|
||||
RUN_VANILLA=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-vanilla.sh
|
||||
RUN_BUKKIT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-bukkit.sh
|
||||
RUN_FABRIC=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-fabric.sh
|
||||
RUN_QUILT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-quilt.sh
|
||||
|
||||
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
|
||||
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
|
||||
BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
|
||||
FABRIC_SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$FABRIC_INSTALLER_VERSION/server/jar
|
||||
QUILT_INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
|
||||
@@ -43,32 +40,32 @@ elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
|
||||
apt-get update
|
||||
apt-get --no-install-recommends -y install openjdk-25-jre-headless
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
|
||||
dpkg -i packages-microsoft-prod.deb
|
||||
apt-get update && apt-get install -y msopenjdk-21
|
||||
apt-get -y update && apt-get -y --fix-broken install
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
|
||||
dpkg -i packages-microsoft-prod.deb
|
||||
apt-get update && apt-get install -y msopenjdk-25
|
||||
apt-get -y update && apt-get -y --fix-broken install
|
||||
fi
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
# dpkg -i packages-microsoft-prod.deb
|
||||
# apt-get update && apt-get install -y msopenjdk-21
|
||||
# apt-get -y update && apt-get -y --fix-broken install
|
||||
# fi
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
# dpkg -i packages-microsoft-prod.deb
|
||||
# apt-get update && apt-get install -y msopenjdk-25
|
||||
# apt-get -y update && apt-get -y --fix-broken install
|
||||
# fi
|
||||
else
|
||||
echo "ERROR ! Java version must be set first run"
|
||||
sleep infinity
|
||||
@@ -78,78 +75,42 @@ fi
|
||||
# Check for server files and download if needed.
|
||||
if [ $MC_TYPE = "vanilla" ]; then
|
||||
echo "INFO ! Vanilla Selected"
|
||||
# Fallback to default channel type if MC_TYPE or MC_VERSION is empty
|
||||
: "${MC_VERSION:=latest}"
|
||||
echo "Using server type: $MC_TYPE"
|
||||
|
||||
# Get the currently installed Minecraft version from the filesystem
|
||||
CUR_VERSION=$(find "$MC_DIR" -name "installed-*" | cut -d - -f2-)
|
||||
echo "Current local version: '${CUR_VERSION:-None}'"
|
||||
|
||||
# Fetch the global Minecraft version manifest cleanly
|
||||
JSON=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json")
|
||||
# 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 Mojang API"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Resolve the target version dynamically
|
||||
if [ ! -z "$MC_VERSION" ] && [ "$MC_VERSION" != "latest" ]; then
|
||||
# User specified an exact version string (e.g., 1.20.1)
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r --arg version "$MC_VERSION" '.versions[] | select(.id == $version) | .id')
|
||||
if [ -z "$TARGET_VERSION" ]; then
|
||||
echo "Error: Specified version '$MC_VERSION' not found in Mojang API."
|
||||
exit 1
|
||||
fi
|
||||
if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
|
||||
else
|
||||
# No version specified or "latest" chosen. Pull from the latest release
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r '.latest.release')
|
||||
fi
|
||||
echo "Target version determined: '$TARGET_VERSION'"
|
||||
# Update variable to match resolved target
|
||||
MC_VERSION=$TARGET_VERSION
|
||||
|
||||
# Compare versions and only update if they do NOT match
|
||||
if [ "$CUR_VERSION" != "$TARGET_VERSION" ]; then
|
||||
echo "Versions differ ($CUR_VERSION vs $TARGET_VERSION). Fetching Minecraft server download URL..."
|
||||
# Extract the target sub-manifest URL for this specific Minecraft version
|
||||
VERSION_CHECK=$(echo "$JSON" | jq -r --arg version "$TARGET_VERSION" '.versions[] | select(.id == $version) | .url')
|
||||
if [ "$VERSION_CHECK" == "null" ] || [ -z "$VERSION_CHECK" ]; then
|
||||
echo "Error: Metadata URL link not found for version $TARGET_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
# Fetch the specific version's metadata JSON and extract the server jar link
|
||||
MC_SERVER_FILE=$(curl -s "$VERSION_CHECK" | jq -r '.downloads.server.url')
|
||||
if [ "$MC_SERVER_FILE" == "null" ] || [ -z "$MC_SERVER_FILE" ]; then
|
||||
echo "Error: Server jar download URL not found for version $TARGET_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
echo "Ready to download: $MC_SERVER_FILE"
|
||||
# Process Vanilla Minecraft downloads
|
||||
echo " "
|
||||
echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
|
||||
echo " "
|
||||
echo "WARNING ! Minecraft server is out of date/missing ... will download now."
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd "$MC_DIR" || exit 1
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
# Wipe old dependencies cleanly
|
||||
rm -fr *.jar libraries defaultconfigs user_jvm_args.txt run.bat
|
||||
# Safely preserve old logs
|
||||
[ -f *.log ] && mv *.log old-server-versions/
|
||||
# Download and fix execution modes
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll "$MC_SERVER_FILE" -O "mcserver-$MC_VERSION.jar"
|
||||
chmod +x "mcserver-$MC_VERSION.jar"
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O mcserver-$MC_VERSION.jar
|
||||
chmod +x mcserver-$MC_VERSION.jar
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
|
||||
[ -f run-*.sh ] && mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll "$RUN_VANILLA" -O "run-$MC_TYPE-$MC_VERSION.sh"
|
||||
chmod +x "run-$MC_TYPE-$MC_VERSION.sh"
|
||||
# Drop updated marker file
|
||||
rm -f installed-*
|
||||
touch installed-$MC_VERSION
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./mcserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
else
|
||||
echo "No update required. Local version matches target version."
|
||||
fi
|
||||
elif [ $MC_TYPE = "bukkit" ]; then
|
||||
echo "INFO ! Bukkit Selected"
|
||||
@@ -164,14 +125,29 @@ elif [ $MC_TYPE = "bukkit" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
|
||||
chmod +x craftbukkit-$MC_VERSION.jar
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_BUKKIT -O run-$MC_TYPE-$MC_VERSION.sh
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./craftbukkit-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
fi
|
||||
@@ -188,14 +164,29 @@ elif [ $MC_TYPE = "fabric" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||
chmod +x fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_FABRIC -O run-$MC_TYPE-$MC_VERSION.sh
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./fabric-*-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
fi
|
||||
@@ -212,7 +203,8 @@ elif [ $MC_TYPE = "quilt" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $QUILT_INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
|
||||
chmod +x quilt-installer-$QUILT_VERSION.jar
|
||||
@@ -224,7 +216,21 @@ elif [ $MC_TYPE = "quilt" ]; then
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_QUILT -O run-$MC_TYPE-$MC_VERSION.sh
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./quilt-server-launch.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
fi
|
||||
@@ -241,7 +247,8 @@ elif [ $MC_TYPE = "forge" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
|
||||
@@ -269,7 +276,8 @@ elif [ $MC_TYPE = "neoforged" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./craftbukkit-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./fabric-*-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./quilt-server-launch.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./mcserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
+3
-5
@@ -1,7 +1,5 @@
|
||||
## 2026-08-09T21:31:42Z
|
||||
## 2026-07-20T19:41:50Z
|
||||
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-08-02T21:36:06Z [skip ci] (fithwum)
|
||||
- Merge changelog updates (fithwum)
|
||||
- Update changelogs on 2026-08-02T21:35:55Z [skip ci] (fithwum)
|
||||
- update (fithwum)
|
||||
- add server.properties file (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
|
||||
+4
-7
@@ -2,9 +2,10 @@ FROM gitea.fithwum.tech/fithwum/debian-base:trixie
|
||||
LABEL maintainer="fithwum"
|
||||
|
||||
# Environment Variables.
|
||||
# Minecarft settings.
|
||||
ENV ACCEPT_EULA=""
|
||||
ENV GAME_PORT=""
|
||||
|
||||
# Minecarft versions.
|
||||
ENV MC_TYPE=""
|
||||
ENV MC_VERSION=""
|
||||
ENV QUILT_VERSION=""
|
||||
@@ -13,13 +14,9 @@ ENV NEOFORGED_VERSION=""
|
||||
ENV FABRIC_VERSION=""
|
||||
ENV FABRIC_INSTALLER_VERSION=""
|
||||
|
||||
# RCON settings.
|
||||
ENV ENABLE_RCON=""
|
||||
ENV RCON_PORT=""
|
||||
ENV RCON_PASSWORD=""
|
||||
|
||||
# Java settings.
|
||||
ENV JAVA_VERSION=""
|
||||
|
||||
ENV XMX_SIZE=""
|
||||
ENV XMS_SIZE=""
|
||||
ENV XMN_SIZE=""
|
||||
@@ -29,7 +26,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
|
||||
|
||||
# Install Java & Dependencies.
|
||||
RUN apt-get -y update \
|
||||
&& apt-get install -y --no-install-recommends bzip2 lsb-release jq screen \
|
||||
&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
|
||||
&& apt-get -y --fix-broken install \
|
||||
&& apt-get -y autoclean \
|
||||
&& apt-get -y autoremove \
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "testing",
|
||||
"commit": "c69d6ee0c3134f7d659fe54d12fc4e9f92d625aa",
|
||||
"build_time": "2026-08-09T21:31:55Z",
|
||||
"commit": "da2be68201de8ab7aa28aaa1399af75f293acf44",
|
||||
"build_time": "2026-07-20T17:29:47Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing",
|
||||
"digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:32acbdb28577d8aecbfbb4c26dc0f9d5ec1b4294f92baec63ead71354d486d07",
|
||||
"image_size": "304MB",
|
||||
"image_size_bytes": 319001396
|
||||
"digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:4c3f85cdaa6b76d2710b0e0b192b597101a1962f098ee22195ed3a255fba6e5f",
|
||||
"image_size": "302MB",
|
||||
"image_size_bytes": 317404973
|
||||
}
|
||||
|
||||
+125
-116
@@ -1,20 +1,25 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
DEBIAN_VERSION=13
|
||||
|
||||
MC_DIR_OLD=/mc_server
|
||||
MC_DIR=/mcserver
|
||||
|
||||
if [ -d "$MC_DIR_OLD" ]; then
|
||||
mkdir -p "$MC_DIR"
|
||||
mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
EULA_FILE=$MC_DIR/eula.txt
|
||||
EULA_MARKER=$MC_DIR/.eula_accepted
|
||||
|
||||
MS_REPO=https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb
|
||||
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/server.properties
|
||||
START_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/start.sh
|
||||
|
||||
RUN_VANILLA=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-vanilla.sh
|
||||
RUN_BUKKIT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-bukkit.sh
|
||||
RUN_FABRIC=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-fabric.sh
|
||||
RUN_QUILT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/run-quilt.sh
|
||||
|
||||
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
|
||||
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
|
||||
BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
|
||||
FABRIC_SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$FABRIC_INSTALLER_VERSION/server/jar
|
||||
QUILT_INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
|
||||
@@ -44,32 +49,32 @@ elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
|
||||
apt-get update
|
||||
apt-get --no-install-recommends -y install openjdk-25-jre-headless
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
|
||||
dpkg -i packages-microsoft-prod.deb
|
||||
apt-get update && apt-get install -y msopenjdk-21
|
||||
apt-get -y update && apt-get -y --fix-broken install
|
||||
fi
|
||||
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
echo "INFO ! $JAVA_VERSION Selected"
|
||||
if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
then
|
||||
echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
else
|
||||
echo " "
|
||||
echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MS_REPO -O packages-microsoft-prod.deb
|
||||
dpkg -i packages-microsoft-prod.deb
|
||||
apt-get update && apt-get install -y msopenjdk-25
|
||||
apt-get -y update && apt-get -y --fix-broken install
|
||||
fi
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-21 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
# dpkg -i packages-microsoft-prod.deb
|
||||
# apt-get update && apt-get install -y msopenjdk-21
|
||||
# apt-get -y update && apt-get -y --fix-broken install
|
||||
# fi
|
||||
# elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
|
||||
# echo "INFO ! $JAVA_VERSION Selected"
|
||||
# if [ dpkg -s msopenjdk-25 &> /dev/null ]
|
||||
# then
|
||||
# echo "INFO ! $JAVA_VERSION installed ... moving on."
|
||||
# else
|
||||
# echo " "
|
||||
# echo "WARNING ! $JAVA_VERSION not installed ... will install now."
|
||||
# wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
|
||||
# dpkg -i packages-microsoft-prod.deb
|
||||
# apt-get update && apt-get install -y msopenjdk-25
|
||||
# apt-get -y update && apt-get -y --fix-broken install
|
||||
# fi
|
||||
else
|
||||
echo "ERROR ! Java version must be set first run"
|
||||
sleep infinity
|
||||
@@ -79,78 +84,42 @@ fi
|
||||
# Check for server files and download if needed.
|
||||
if [ $MC_TYPE = "vanilla" ]; then
|
||||
echo "INFO ! Vanilla Selected"
|
||||
# Fallback to default channel type if MC_TYPE or MC_VERSION is empty
|
||||
: "${MC_VERSION:=latest}"
|
||||
echo "Using server type: $MC_TYPE"
|
||||
|
||||
# Get the currently installed Minecraft version from the filesystem
|
||||
CUR_VERSION=$(find "$MC_DIR" -name "installed-*" | cut -d - -f2-)
|
||||
echo "Current local version: '${CUR_VERSION:-None}'"
|
||||
|
||||
# Fetch the global Minecraft version manifest cleanly
|
||||
JSON=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json")
|
||||
# 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 Mojang API"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Resolve the target version dynamically
|
||||
if [ ! -z "$MC_VERSION" ] && [ "$MC_VERSION" != "latest" ]; then
|
||||
# User specified an exact version string (e.g., 1.20.1)
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r --arg version "$MC_VERSION" '.versions[] | select(.id == $version) | .id')
|
||||
if [ -z "$TARGET_VERSION" ]; then
|
||||
echo "Error: Specified version '$MC_VERSION' not found in Mojang API."
|
||||
exit 1
|
||||
fi
|
||||
if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
|
||||
then
|
||||
echo " "
|
||||
echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
|
||||
else
|
||||
# No version specified or "latest" chosen. Pull from the latest release
|
||||
TARGET_VERSION=$(echo "$JSON" | jq -r '.latest.release')
|
||||
fi
|
||||
echo "Target version determined: '$TARGET_VERSION'"
|
||||
# Update variable to match resolved target
|
||||
MC_VERSION=$TARGET_VERSION
|
||||
|
||||
# Compare versions and only update if they do NOT match
|
||||
if [ "$CUR_VERSION" != "$TARGET_VERSION" ]; then
|
||||
echo "Versions differ ($CUR_VERSION vs $TARGET_VERSION). Fetching Minecraft server download URL..."
|
||||
# Extract the target sub-manifest URL for this specific Minecraft version
|
||||
VERSION_CHECK=$(echo "$JSON" | jq -r --arg version "$TARGET_VERSION" '.versions[] | select(.id == $version) | .url')
|
||||
if [ "$VERSION_CHECK" == "null" ] || [ -z "$VERSION_CHECK" ]; then
|
||||
echo "Error: Metadata URL link not found for version $TARGET_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
# Fetch the specific version's metadata JSON and extract the server jar link
|
||||
MC_SERVER_FILE=$(curl -s "$VERSION_CHECK" | jq -r '.downloads.server.url')
|
||||
if [ "$MC_SERVER_FILE" == "null" ] || [ -z "$MC_SERVER_FILE" ]; then
|
||||
echo "Error: Server jar download URL not found for version $TARGET_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
echo "Ready to download: $MC_SERVER_FILE"
|
||||
# Process Vanilla Minecraft downloads
|
||||
echo " "
|
||||
echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
|
||||
echo " "
|
||||
echo "WARNING ! Minecraft server is out of date/missing ... will download now."
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd "$MC_DIR" || exit 1
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
# Wipe old dependencies cleanly
|
||||
rm -fr *.jar libraries defaultconfigs user_jvm_args.txt run.bat
|
||||
# Safely preserve old logs
|
||||
[ -f *.log ] && mv *.log old-server-versions/
|
||||
# Download and fix execution modes
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll "$MC_SERVER_FILE" -O "mcserver-$MC_VERSION.jar"
|
||||
chmod +x "mcserver-$MC_VERSION.jar"
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O mcserver-$MC_VERSION.jar
|
||||
chmod +x mcserver-$MC_VERSION.jar
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
|
||||
[ -f run-*.sh ] && mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll "$RUN_VANILLA" -O "run-$MC_TYPE-$MC_VERSION.sh"
|
||||
chmod +x "run-$MC_TYPE-$MC_VERSION.sh"
|
||||
# Drop updated marker file
|
||||
rm -f installed-*
|
||||
touch installed-$MC_VERSION
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./mcserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
else
|
||||
echo "No update required. Local version matches target version."
|
||||
fi
|
||||
elif [ $MC_TYPE = "bukkit" ]; then
|
||||
echo "INFO ! Bukkit Selected"
|
||||
@@ -165,14 +134,29 @@ elif [ $MC_TYPE = "bukkit" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
|
||||
chmod +x craftbukkit-$MC_VERSION.jar
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_BUKKIT -O run-$MC_TYPE-$MC_VERSION.sh
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./craftbukkit-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
fi
|
||||
@@ -189,14 +173,29 @@ elif [ $MC_TYPE = "fabric" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||
chmod +x fabric-$MC_VERSION-$FABRIC_VERSION.jar
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_FABRIC -O run-$MC_TYPE-$MC_VERSION.sh
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./fabric-*-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
fi
|
||||
@@ -213,7 +212,8 @@ elif [ $MC_TYPE = "quilt" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $QUILT_INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
|
||||
chmod +x quilt-installer-$QUILT_VERSION.jar
|
||||
@@ -225,7 +225,21 @@ elif [ $MC_TYPE = "quilt" ]; then
|
||||
echo " "
|
||||
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $RUN_QUILT -O run-$MC_TYPE-$MC_VERSION.sh
|
||||
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2022 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./quilt-server-launch.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
if [ $? -eq 0 ]; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
EOF
|
||||
chmod +x run-$MC_TYPE-$MC_VERSION.sh
|
||||
cd ..
|
||||
fi
|
||||
@@ -242,7 +256,8 @@ elif [ $MC_TYPE = "forge" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
|
||||
@@ -270,7 +285,8 @@ elif [ $MC_TYPE = "neoforged" ]; then
|
||||
echo "INFO ! Cleaning old files."
|
||||
cd $MC_DIR
|
||||
mkdir -pv old-server-versions/
|
||||
rm -fr *.jar libraries defaultconfigs config mods user_jvm_args.txt run.bat
|
||||
rm -fr *.jar
|
||||
rm -fr libraries
|
||||
mv -v *.log old-server-versions/
|
||||
mv -v run-*.sh old-server-versions/
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
|
||||
@@ -297,13 +313,6 @@ else
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting RCON settings."
|
||||
if [ -f $MC_DIR/server.properties ]; then
|
||||
sed -i '/enable-rcon='*'/c\enable-rcon='$ENABLE_RCON'' $MC_DIR/server.properties
|
||||
sed -i '/rcon.port='*'/c\rcon.port='$RCON_PORT'' $MC_DIR/server.properties
|
||||
sed -i '/rcon.password='*'/c\rcon.password='$RCON_PASSWORD'' $MC_DIR/server.properties
|
||||
fi
|
||||
|
||||
echo "INFO ! Setting game port."
|
||||
if [ -f $MC_DIR/server.properties ]; then
|
||||
sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
|
||||
@@ -336,13 +345,12 @@ else
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
# Download the start file for the screen session
|
||||
if [ -f $MC_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 $MC_DIR/start.sh
|
||||
chmod +x $MC_DIR/start.sh
|
||||
chmod +x start.sh
|
||||
fi
|
||||
|
||||
# Set permissions.
|
||||
@@ -356,5 +364,6 @@ echo " "
|
||||
echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
|
||||
cd $MC_DIR
|
||||
exec ./start.sh
|
||||
# exec ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
|
||||
exit
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./craftbukkit-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./fabric-*-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./quilt-server-launch.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# All rights reserved
|
||||
|
||||
cd /mcserver
|
||||
JAR=./mcserver-*.jar
|
||||
|
||||
while [ true ]; do
|
||||
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
|
||||
EXIT_CODE=$?
|
||||
echo "Minecraft exited with code $EXIT_CODE"
|
||||
[ "$EXIT_CODE" -eq 0 ] && break
|
||||
echo "Restarting server in 5 seconds..."
|
||||
sleep 5
|
||||
done
|
||||
+7
-23
@@ -1,31 +1,15 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 2026 fithwum
|
||||
# Copyright (c) 2020 fithwum
|
||||
# All rights reserved
|
||||
|
||||
LOGFILE=/mcserver/logs/latest.log
|
||||
SESSION=mcserver
|
||||
|
||||
cd /mcserver
|
||||
exec ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
|
||||
# Check if a screen session is already running
|
||||
if screen -list | grep -q "mcserver"; then
|
||||
echo "INFO ! A screen session for the Minecraft server is already running."
|
||||
cleanup() {
|
||||
echo "[INFO] Stopping Minecraft..."
|
||||
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
|
||||
|
||||
else
|
||||
# Start the Minecraft server in a detached screen session
|
||||
echo "INFO ! Starting Minecraft Server in a screen session."
|
||||
touch "$LOGFILE"
|
||||
screen -L -Logfile "$LOGFILE" -dmS "$SESSION" bash -c ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
exec tail -F "$LOGFILE"
|
||||
screen -mS mcserver bash -c ./run-$MC_TYPE-$MC_VERSION.sh
|
||||
fi
|
||||
Reference in New Issue
Block a user