Skip to content

Commit fae7799

Browse files
authored
Exclude Netty http3 to ensure Alpine musl support (#3765)
1 parent a29bb02 commit fae7799

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
4949
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
5050
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
5151

52-
ARG MC_HELPER_VERSION=1.50.5
52+
ARG MC_HELPER_VERSION=1.50.6
5353
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
5454
# used for cache busting local copy of mc-image-helper
5555
ARG MC_HELPER_REV=1

tests/fulltests/multi-part-motd/docker-compose.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
services:
22
monitor:
33
depends_on:
4-
- mc
4+
mc:
5+
condition: service_started
56
image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
67
entrypoint: mc-monitor
78
command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 60
9+
restart: no
810
mc:
9-
restart: "no"
11+
restart: no
1012
image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
1113
environment:
1214
EULA: "TRUE"
1315
VERSION: ${MINECRAFT_VERSION:-LATEST}
1416
TYPE: PAPER
1517
# regression tests https://github.com/itzg/docker-minecraft-server/issues/2545
1618
MOTD: "Foo§rBar"
17-

tests/fulltests/test.sh

100644100755
Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,28 @@
33
# go to script root directory
44
cd "$(dirname "$0")" || exit 1
55

6-
down() {
7-
docker compose -f "$1" down -v --remove-orphans
8-
}
9-
106
# tests to completely spin up Minecraft and use the monitor to validate the service is running.
117
fullMinecraftUpTest(){
128
file="$1"
13-
failed=false
9+
result=0
10+
11+
echo "Testing with images:"
12+
docker compose -f "$file" config --images
13+
1414
# run the monitor to validate the Minecraft image is healthy
15-
docker compose -f "$file" run monitor || failed=true
16-
echo "$(dirname "$file") Result: failed=$failed"
17-
if $failed; then
18-
docker compose logs mc
19-
down "$file"
20-
return 1
15+
upArgs=(
16+
--attach-dependencies
17+
--always-recreate-deps
18+
--abort-on-container-failure
19+
)
20+
if ! docker compose -f "$file" up "${upArgs[@]}" monitor; then
21+
echo "$(dirname "$file") Result: failed"
22+
result=1
2123
else
22-
down "$file"
24+
echo "$(dirname "$file") Result: success"
2325
fi
26+
docker compose -f "$file" down -v --remove-orphans
27+
return $result
2428
}
2529

2630
# go through each folder in fulltests and run fullbuilds

tests/fulltests/vanilla-latest/docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
services:
22
monitor:
33
depends_on:
4-
- mc
4+
mc:
5+
condition: service_started
56
image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
67
entrypoint: mc-monitor
78
command: status --host mc --retry-interval 1s --timeout 1s --retry-limit 300
9+
restart: no
810
mc:
9-
restart: "no"
11+
restart: no
1012
image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
1113
environment:
1214
EULA: "TRUE"

0 commit comments

Comments
 (0)