diff --git a/Dockerfile b/Dockerfile index fae23a04a95..a111db0e280 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.25.11 +ARG MC_HELPER_VERSION=1.25.12 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ | tar -C /usr/share -zxf - \ diff --git a/scripts/start-deployForge b/scripts/start-deployForge index 52e5d956ea3..e19f2e2d6db 100755 --- a/scripts/start-deployForge +++ b/scripts/start-deployForge @@ -7,11 +7,13 @@ . "${SCRIPTS:-$(dirname "$0")}/start-utils" isDebugging && set -x +# NOTE: VERSION rather than VANILLA_VERSION is specified to allow for latest supported +# Forge version to be selected. if [[ ${FORGE_INSTALLER} ]]; then if ! mc-image-helper install-forge \ --output-directory=/data \ --results-file=/data/.run-forge.env \ - --minecraft-version="${VANILLA_VERSION}" \ + --minecraft-version="${VERSION}" \ --forge-installer="${FORGE_INSTALLER}" \ --force-reinstall="${FORGE_FORCE_REINSTALL}"; then log "ERROR failed to install Forge given installer ${FORGE_INSTALLER}" @@ -22,7 +24,7 @@ else if ! mc-image-helper install-forge \ --output-directory=/data \ --results-file=/data/.run-forge.env \ - --minecraft-version="${VANILLA_VERSION}" \ + --minecraft-version="${VERSION}" \ --forge-version="${FORGE_VERSION}" \ --force-reinstall="${FORGE_FORCE_REINSTALL}"; then log "ERROR failed to install Forge"