Exclude Netty http3 to ensure Alpine musl support (#3765)

This commit is contained in:
Geoff Bourne
2025-11-15 11:54:40 -06:00
committed by GitHub
parent a29bb020d9
commit fae779998a
4 changed files with 25 additions and 18 deletions

View File

@@ -49,7 +49,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \ --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
ARG MC_HELPER_VERSION=1.50.5 ARG MC_HELPER_VERSION=1.50.6
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
# used for cache busting local copy of mc-image-helper # used for cache busting local copy of mc-image-helper
ARG MC_HELPER_REV=1 ARG MC_HELPER_REV=1

View File

@@ -1,12 +1,14 @@
services: services:
monitor: monitor:
depends_on: depends_on:
- mc mc:
condition: service_started
image: ${IMAGE_TO_TEST:-itzg/minecraft-server} image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
entrypoint: mc-monitor entrypoint: mc-monitor
command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 60 command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 60
restart: no
mc: mc:
restart: "no" restart: no
image: ${IMAGE_TO_TEST:-itzg/minecraft-server} image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
environment: environment:
EULA: "TRUE" EULA: "TRUE"
@@ -14,4 +16,3 @@ services:
TYPE: PAPER TYPE: PAPER
# regression tests https://github.com/itzg/docker-minecraft-server/issues/2545 # regression tests https://github.com/itzg/docker-minecraft-server/issues/2545
MOTD: "Foo§rBar" MOTD: "Foo§rBar"

28
tests/fulltests/test.sh Normal file → Executable file
View File

@@ -3,24 +3,28 @@
# go to script root directory # go to script root directory
cd "$(dirname "$0")" || exit 1 cd "$(dirname "$0")" || exit 1
down() {
docker compose -f "$1" down -v --remove-orphans
}
# tests to completely spin up Minecraft and use the monitor to validate the service is running. # tests to completely spin up Minecraft and use the monitor to validate the service is running.
fullMinecraftUpTest(){ fullMinecraftUpTest(){
file="$1" file="$1"
failed=false result=0
echo "Testing with images:"
docker compose -f "$file" config --images
# run the monitor to validate the Minecraft image is healthy # run the monitor to validate the Minecraft image is healthy
docker compose -f "$file" run monitor || failed=true upArgs=(
echo "$(dirname "$file") Result: failed=$failed" --attach-dependencies
if $failed; then --always-recreate-deps
docker compose logs mc --abort-on-container-failure
down "$file" )
return 1 if ! docker compose -f "$file" up "${upArgs[@]}" monitor; then
echo "$(dirname "$file") Result: failed"
result=1
else else
down "$file" echo "$(dirname "$file") Result: success"
fi fi
docker compose -f "$file" down -v --remove-orphans
return $result
} }
# go through each folder in fulltests and run fullbuilds # go through each folder in fulltests and run fullbuilds

View File

@@ -1,12 +1,14 @@
services: services:
monitor: monitor:
depends_on: depends_on:
- mc mc:
condition: service_started
image: ${IMAGE_TO_TEST:-itzg/minecraft-server} image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
entrypoint: mc-monitor entrypoint: mc-monitor
command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 300 command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 300
restart: no
mc: mc:
restart: "no" restart: no
image: ${IMAGE_TO_TEST:-itzg/minecraft-server} image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
environment: environment:
EULA: "TRUE" EULA: "TRUE"