Update build-info on 2025-11-09T01:33:20Z

.cache/debian-base.digest

@@ -1 +1 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:25757d57b4e94d25a09d0786251d9062116a640be3dc7963710ed63d0aaab41b
+gitea.fithwum.tech/fithwum/debian-base@sha256:4637270ad227991615e0e01e211aef28a42a35bd9bde9e56189d684ed6f8b750

.gitea/workflows/pipeline.yml

@@ -8,11 +8,12 @@ on:
       - '.gitea/workflows/*.yml'
       - '**/Dockerfile'
       - '**/*.sh'
+      - '!.cache/*'
       - '!**/CHANGES.md'
       - '!**/build-info.json'
   schedule:
-    - cron: '30 */6 * * *'
+    - cron: '30 1 * * 0'
-
+###############################
 env:
   IMAGE_REGISTRY: gitea.fithwum.tech
   IMAGE_ORG: ${{ secrets.GIT_USERNAME }}
@@ -20,7 +21,7 @@ env:
   IMAGE_REPO_MINECRAFT: minecraft
   IMAGE_TAG_DEBIAN: bookworm
   DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: vanilla testing fabric
+  VERSIONS: vanilla testing-vanilla fabric testing-fabric
 
 jobs:
   poll-debian-base-and-detect-changes:
@@ -28,7 +29,7 @@ jobs:
     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
@@ -55,18 +56,59 @@ jobs:
         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
-          else
+            exit 0
-            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
-            git push
-            echo "changed=true" >> $GITHUB_OUTPUT
           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: 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
+
       - name: Detect changed Minecraft versions
         id: check_changed_versions
         run: |
@@ -81,14 +123,33 @@ jobs:
           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: 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 != ''
+    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: [vanilla, testing, fabric]
+        version: [vanilla, testing-vanilla, fabric, testing-fabric]
     name: Build and Push ${{ matrix.version }}
     steps:
       - name: Checkout repo

fabric/CHANGES.md

@@ -1,5 +1,4 @@
-## 2025-07-15T15:48:33Z
+## 2025-11-09T01:32:30Z
 
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:25757d57b4e94d25a09d0786251d9062116a640be3dc7963710ed63d0aaab41b (fithwum)
+- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:4637270ad227991615e0e01e211aef28a42a35bd9bde9e56189d684ed6f8b750 (fithwum)
-- update runners (fithwum)
+- Update build-info on 2025-10-26T23:19:59Z (fithwum)
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:b9905e20e41d888f0168ab8727658776971487c41599fada5806d99708c32a17 (fithwum)

fabric/build-info.json

@@ -1,9 +1,9 @@
 {
   "version": "fabric",
-  "commit": "64426e435348815d9d4edc9d0f37402525024d8e",
+  "commit": "8fc3be0e182d0503d5e3fa42b4f3dde90a9a3588",
-  "build_time": "2025-07-15T15:48:57Z",
+  "build_time": "2025-11-09T01:33:05Z",
   "image_tag": "gitea.fithwum.tech/fithwum/minecraft:fabric",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:9d6397acad0024054a84c389fe44b87f230450b203b394ee050ed27b1c2af0b1",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:45198e89e789c2515a440d51feec6da0e6171195da570e76c4653e0460f7ab99",
   "image_size": "1GB",
-  "image_size_bytes": 1134660796
+  "image_size_bytes": 1135824848
 }

testing-fabric/CHANGES.md

@@ -0,0 +1,4 @@
+## 2025-11-09T01:32:30Z
+
+- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:4637270ad227991615e0e01e211aef28a42a35bd9bde9e56189d684ed6f8b750 (fithwum)
+- Update build-info on 2025-10-26T23:19:59Z (fithwum)

testing-fabric/Dockerfile

@@ -0,0 +1,45 @@
+FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
+LABEL maintainer="fithwum"
+
+# Environment Variables
+ENV ACCEPT_EULA=""
+ENV GAME_PORT=""
+ENV MC_VERSION=""
+ENV FABRIC_VERSION=""
+ENV INSTALLER_VERSION=""
+ENV XMX_SIZE=""
+ENV XMS_SIZE=""
+ENV XMN_SIZE=""
+
+# URL's for files
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/install_script.sh
+
+# Install Dependencies.
+RUN apt-get -y update \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq\
+	&& apt-get -y --fix-broken install \
+	&& apt-get -y autoclean \
+	&& apt-get -y autoremove \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& update-ca-certificates -f;
+
+# Install java
+RUN wget https://packages.microsoft.com/config/debian/12/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
+
+# Folder creation.
+RUN mkdir -p /MCserver /MCtemp \
+	&& chmod 777 -R /MCserver /MCtemp \
+	&& chown 99:100 -R /MCserver /MCtemp
+
+# Main script
+RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
+	&& chmod +x /MCtemp/install_script.sh
+
+# Directory where data is stored
+VOLUME /MCserver
+
+# Run command
+CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]

testing-fabric/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "testing-fabric",
+  "commit": "8fc3be0e182d0503d5e3fa42b4f3dde90a9a3588",
+  "build_time": "2025-11-09T01:33:20Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing-fabric",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:7323faf65f71809d9965ae0547146212dcbb49786505e9a9a06f3965f1e6a628",
+  "image_size": "1GB",
+  "image_size_bytes": 1135624982
+}

testing-fabric/install_script.sh

@@ -0,0 +1,100 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+# Main Install Links
+SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
+
+rm -fr /MCserver/run_*.sh
+
+# Main install (Debian).
+# Check for server files and download if needed.
+if [ -e /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
+	then
+		echo " "
+		echo "INFO ! fabric-$MC_VERSION-$FABRIC_VERSION.jar found starting now."
+	else
+		echo " "
+		echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now."
+			echo " "
+			echo "INFO ! Cleaning old files."
+			mkdir /MCserver/old-server-versions
+			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
+			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+fi
+
+sleep 1
+
+# Looking for run.sh
+if [ -e /MCserver/run-$MC_VERSION.sh ]
+	then
+		echo " "
+		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
+	else
+		echo " "
+		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+fi
+
+# Check for EULA
+if [ ! -f /MCserver/eula.txt ]; then
+	:
+else
+	if [ "$ACCEPT_EULA" == "false" ]; then
+		if grep -rq 'eula=true' /MCserver/eula.txt; then
+			sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+sleep 1
+
+if [ ! -f /MCserver/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "$ACCEPT_EULA" == "true" ]; then
+	if grep -rq 'eula=false' /MCserver/eula.txt; then
+		sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+		exit 0
+	fi
+elif [ "$ACCEPT_EULA" == "false" ]; then
+	echo " "
+	echo "WARNING ! EULA not accepted, you must accept the EULA"
+	echo "			to start the Server, putting server in sleep mode"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+sleep 1
+echo "INFO ! Setting game port."
+sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /MCserver/server.properties
+sleep 1
+
+# Set permissions.
+chown 99:100 -R /MCserver
+chmod 777 -R /MCserver
+chmod +x /MCserver/run-$MC_VERSION.sh
+chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION"
+exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+
+exit

testing-fabric/run.sh

@@ -0,0 +1,13 @@
+#!/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

testing-vanilla/CHANGES.md

@@ -0,0 +1,4 @@
+## 2025-11-09T01:32:30Z
+
+- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:4637270ad227991615e0e01e211aef28a42a35bd9bde9e56189d684ed6f8b750 (fithwum)
+- Update build-info on 2025-10-26T23:19:59Z (fithwum)

testing-vanilla/Dockerfile

@@ -10,7 +10,7 @@ ENV XMS_SIZE=""
 ENV XMN_SIZE=""
 
 # URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/install_script.sh
+ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing-vanilla/install_script.sh
 
 # Install Dependencies.
 RUN apt-get -y update \

testing-vanilla/build-info.json

@@ -0,0 +1,9 @@
+{
+  "version": "testing-vanilla",
+  "commit": "8fc3be0e182d0503d5e3fa42b4f3dde90a9a3588",
+  "build_time": "2025-11-09T01:33:05Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing-vanilla",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:8246c93597e7a2c41b40c79f7e502e344c2511f44bf3e2b4c076e24bdaf764c0",
+  "image_size": "1GB",
+  "image_size_bytes": 1135847196
+}

testing/CHANGES.md

@@ -1,5 +0,0 @@
-## 2025-07-15T15:48:33Z
-
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:25757d57b4e94d25a09d0786251d9062116a640be3dc7963710ed63d0aaab41b (fithwum)
-- update runners (fithwum)
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:b9905e20e41d888f0168ab8727658776971487c41599fada5806d99708c32a17 (fithwum)

testing/build-info.json

@@ -1,9 +0,0 @@
-{
-  "version": "testing",
-  "commit": "64426e435348815d9d4edc9d0f37402525024d8e",
-  "build_time": "2025-07-15T15:48:42Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:f46403bb8b911df8ed2938c598baa1286934198c2f0a6e387ff6fecdcce2bf43",
-  "image_size": "1GB",
-  "image_size_bytes": 1134639046
-}

vanilla/CHANGES.md

@@ -1,5 +1,4 @@
-## 2025-07-15T15:48:33Z
+## 2025-11-09T01:32:30Z
 
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:25757d57b4e94d25a09d0786251d9062116a640be3dc7963710ed63d0aaab41b (fithwum)
+- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:4637270ad227991615e0e01e211aef28a42a35bd9bde9e56189d684ed6f8b750 (fithwum)
-- update runners (fithwum)
+- Update build-info on 2025-10-26T23:19:59Z (fithwum)
-- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:b9905e20e41d888f0168ab8727658776971487c41599fada5806d99708c32a17 (fithwum)

vanilla/build-info.json

@@ -1,9 +1,9 @@
 {
   "version": "vanilla",
-  "commit": "64426e435348815d9d4edc9d0f37402525024d8e",
+  "commit": "8fc3be0e182d0503d5e3fa42b4f3dde90a9a3588",
-  "build_time": "2025-07-15T15:48:41Z",
+  "build_time": "2025-11-09T01:32:50Z",
   "image_tag": "gitea.fithwum.tech/fithwum/minecraft:vanilla",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:b53ff67b440fd4774cbb2fda05a6178272724cb826f30cb92b6bd476d479b2ce",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:72fa3e88e91d8d0368ce44ab71d4504252aba65409222798d1ed431e68f3ae37",
   "image_size": "1GB",
-  "image_size_bytes": 1134638947
+  "image_size_bytes": 1135625049
 }