Compare commits

...
3 Commits
3 changed files with 55 additions and 17 deletions

No files matched your search

+33
View File
@@ -0,0 +1,33 @@
name: Build FEX Bedrock Stack
on:
workflow_dispatch:
schedule:
- cron: "0 4 * * 1"
jobs:
build:
runs-on: [docker-cli]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Login to Gitea Registry
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.niklashmotion.art -u Hermes --password-stdin
- name: Build image (fresh FEX PPA + fresh Ubuntu rootfs)
run: |
docker pull ubuntu:24.04
DOCKER_BUILDKIT=1 docker build --build-arg EMULATOR=fex \
-t git.niklashmotion.art/hermes/fex-bedrock-stack:latest \
-t git.niklashmotion.art/hermes/fex-bedrock-stack:$(date +%Y%m%d) .
- name: Push to Gitea Registry
run: docker push --all-tags git.niklashmotion.art/hermes/fex-bedrock-stack
- name: Sync local tag (no container restart)
run: |
docker pull git.niklashmotion.art/hermes/fex-bedrock-stack:latest
docker tag git.niklashmotion.art/hermes/fex-bedrock-stack:latest fex-bedrock-stack:latest
- name: Cleanup
run: docker image prune -f
+3 -2
View File
@@ -579,9 +579,10 @@ fi
echo "Starting Bedrock server..." echo "Starting Bedrock server..."
if [[ -f /usr/local/bin/box64 ]] && isTrue "${USE_BOX64:=false}" ; then if [[ -f /usr/local/bin/box64 ]] && isTrue "${USE_BOX64:=false}" ; then
exec mc-server-runner "${mcServerRunnerArgs[@]}" box64 ./"$SERVER" exec mc-server-runner "${mcServerRunnerArgs[@]}" box64 ./"$SERVER"
elif [[ -x /usr/bin/FEXInterpreter ]] && isTrue "${USE_FEX:=true}" ; then elif [[ -x /usr/bin/FEX ]] && isTrue "${USE_FEX:=true}" ; then
# FEX-Emu (x86_64 on arm64): RootFS and emulator are baked into the image. # FEX-Emu (x86_64 on arm64): RootFS and emulator are baked into the image.
# FEX_EMU_DIR holds the JIT/AOT caches — keep it on a volume for warm starts. # FEX_EMU_DIR holds the JIT/AOT caches — keep it on a volume for warm starts.
# FEX >= 2611: unified launcher is /usr/bin/FEX (FEXInterpreter was removed).
export FEX_ROOTFS="${FEX_ROOTFS:-/opt/fex-emu-rootfs/rootfs}" export FEX_ROOTFS="${FEX_ROOTFS:-/opt/fex-emu-rootfs/rootfs}"
export FEX_EMU_DIR="${FEX_EMU_DIR:-$HOME/.fex-emu}" export FEX_EMU_DIR="${FEX_EMU_DIR:-$HOME/.fex-emu}"
mkdir -p "$FEX_EMU_DIR" mkdir -p "$FEX_EMU_DIR"
@@ -595,7 +596,7 @@ elif [[ -x /usr/bin/FEXInterpreter ]] && isTrue "${USE_FEX:=true}" ; then
} }
FEXCONF FEXCONF
fi fi
exec mc-server-runner "${mcServerRunnerArgs[@]}" /usr/bin/FEXInterpreter ./"$SERVER" exec mc-server-runner "${mcServerRunnerArgs[@]}" /usr/bin/FEX ./"$SERVER"
else else
exec mc-server-runner "${mcServerRunnerArgs[@]}" ./"$SERVER" exec mc-server-runner "${mcServerRunnerArgs[@]}" ./"$SERVER"
fi fi
+19 -15
View File
@@ -9,18 +9,8 @@ fi
EMULATOR="${EMULATOR:-fex}" EMULATOR="${EMULATOR:-fex}"
apt-get update apt-get update
if [ "$EMULATOR" = "box64" ] ; then if [ "$EMULATOR" = "fex" ] ; then
DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring # FEX-Emu: official PPA (arm64 builds), Ubuntu base required
curl -L https://ryanfortner.github.io/box64-debs/box64.list -o /etc/apt/sources.list.d/box64.list
curl -L https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
"$BOX64_PACKAGE" \
libjemalloc2
else
# FEX-Emu: comes from the official PPA (arm64 builds), Ubuntu base required
DEBIAN_FRONTEND=noninteractive apt-get install -y \ DEBIAN_FRONTEND=noninteractive apt-get install -y \
software-properties-common \ software-properties-common \
squashfs-tools \ squashfs-tools \
@@ -29,9 +19,12 @@ else
add-apt-repository -y ppa:fex-emu/fex add-apt-repository -y ppa:fex-emu/fex
apt-get update apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
fex-emu \ # fex-emu is a virtual package; pick the explicit variant matching the CPU.
libjemalloc2 # RK3588 (Cortex-A76) has ARMv8.2 features; fall back to armv8.0.
FEX_PKG="fex-emu-armv8.2"
apt-get install -y --no-install-recommends "$FEX_PKG" || FEX_PKG="fex-emu-armv8.0"
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "$FEX_PKG" libjemalloc2
# Thunks are optional but speed up glibc-heavy servers # Thunks are optional but speed up glibc-heavy servers
DEBIAN_FRONTEND=noninteractive apt-get install -y fex-emu-thunks 2>/dev/null || true DEBIAN_FRONTEND=noninteractive apt-get install -y fex-emu-thunks 2>/dev/null || true
@@ -47,6 +40,17 @@ else
mkdir -p /opt/fex-emu-rootfs mkdir -p /opt/fex-emu-rootfs
unsquashfs -q -d /opt/fex-emu-rootfs/rootfs /tmp/fex-rootfs.sqsh unsquashfs -q -d /opt/fex-emu-rootfs/rootfs /tmp/fex-rootfs.sqsh
rm -f /tmp/fex-rootfs.sqsh rm -f /tmp/fex-rootfs.sqsh
else
# Box64 fallback
DEBIAN_FRONTEND=noninteractive apt-get install -y debian-keyring
curl -L https://ryanfortner.github.io/box64-debs/box64.list -o /etc/apt/sources.list.d/box64.list
curl -L https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
"$BOX64_PACKAGE" \
libjemalloc2
fi fi
apt-get clean apt-get clean