diff --git a/Dockerfile b/Dockerfile index d52c7c73b26..bc87c44f73c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --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 -ARG MC_HELPER_VERSION=1.40.2 +ARG MC_HELPER_VERSION=1.40.4 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 ARG MC_HELPER_REV=1 diff --git a/tests/setuponlytests/vanillatweaks_file/docker-compose.yml b/tests/setuponlytests/vanillatweaks_file/docker-compose.yml index b2b5986fa53..8786d85d710 100644 --- a/tests/setuponlytests/vanillatweaks_file/docker-compose.yml +++ b/tests/setuponlytests/vanillatweaks_file/docker-compose.yml @@ -3,7 +3,7 @@ services: restart: "no" image: ${IMAGE_TO_TEST:-itzg/minecraft-server} environment: - VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/config/vt-resourcepacks.json + VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json EULA: "TRUE" SETUP_ONLY: "TRUE" # the following are only used to speed up test execution @@ -14,6 +14,5 @@ services: - ./data:/data - ./vt-datapacks.json:/config/vt-datapacks.json:ro - ./vt-craftingtweaks.json:/config/vt-craftingtweaks.json:ro - - ./vt-resourcepacks.json:/config/vt-resourcepacks.json:ro # the following are only used to speed up test execution - ./verify.sh:/servers/fake.jar diff --git a/tests/setuponlytests/vanillatweaks_file/require.sh b/tests/setuponlytests/vanillatweaks_file/require.sh new file mode 100755 index 00000000000..a3b89f114b9 --- /dev/null +++ b/tests/setuponlytests/vanillatweaks_file/require.sh @@ -0,0 +1 @@ +[[ $EXTENDED_TESTS ]] || exit 1 \ No newline at end of file